@atlaskit/smart-card 41.0.2 → 41.0.4

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

@@ -0,0 +1,23 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import AKLink from '@atlaskit/link';
+import { withLinkClickedEvent } from '../../../utils/analytics/click';
+const Anchor = withLinkClickedEvent('a');
+export const LinkComponent = withLinkClickedEvent(AKLink);
+const Hyperlink = ({
+  href,
+  children,
+  testId,
+  isLinkComponent = false,
+  ...props
+}) => {
+  const Link = isLinkComponent ? LinkComponent : Anchor;
+  return /*#__PURE__*/React.createElement(Link, _extends({}, isLinkComponent ? {
+    testId
+  } : {
+    'data-testid': testId
+  }, {
+    href: href || ''
+  }, props), children);
+};
+export default Hyperlink;

package/dist/es2019/view/LinkUrl/HyperlinkResolver/error-boundary.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
+// Remove on navx-1834-refactor-resolved-hyperlink cleanup
 const withErrorBoundary = Component => props => {
   return /*#__PURE__*/React.createElement(ErrorBoundary, {
     fallback: null

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

@@ -1,24 +1,74 @@
-import React, { useContext } from 'react';
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useCallback, useContext } from 'react';
+import { withErrorBoundary as withReactErrorBoundary } from 'react-error-boundary';
+import { injectIntl } from 'react-intl-next';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
+import { extractSmartLinkProvider } from '@atlaskit/link-extractors';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SmartCardContext } from '../../../state';
+import { getServices } from '../../../state/helpers';
+import useResolveHyperlink from '../../../state/hooks/use-resolve-hyperlink';
+import useResolveHyperlinkValidator, { isGoogleDomain, isSharePointDomain } from '../../../state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator';
+import withIntlProvider from '../../common/intl-provider';
+import Hyperlink from '../Hyperlink';
 import withErrorBoundary from './error-boundary';
 import { ResolveHyperlink } from './resolve-hyperlink';
-const isSharePointDomain = href => {
-  try {
-    const hostname = new URL(href).hostname.toLowerCase();
-    return hostname.includes('sharepoint.com') || hostname.includes('onedrive.live.com');
-  } catch {
-    return false;
-  }
+import HyperlinkUnauthorizedView from './unauthorize-view';
+const HyperlinkFallbackComponent = () => null;
+const withValidator = (Component, DefaultComponent) => props => {
+  const shouldResolveHyperlink = useResolveHyperlinkValidator(props === null || props === void 0 ? void 0 : props.href);
+  return shouldResolveHyperlink ? /*#__PURE__*/React.createElement(Component, props) : /*#__PURE__*/React.createElement(DefaultComponent, props);
 };
-const isGoogleDomain = href => {
-  try {
-    const hostname = new URL(href).hostname.toLowerCase();
-    return hostname.includes('docs.google.com') || hostname.includes('drive.google.com');
-  } catch {
-    return false;
+const HyperlinkWithSmartLinkResolverInner = ({
+  onClick: onClickCallback,
+  ...props
+}) => {
+  const {
+    actions,
+    state
+  } = useResolveHyperlink({
+    href: props.href || ''
+  });
+  const services = getServices(state === null || state === void 0 ? void 0 : state.details);
+  const onClick = useCallback(e => {
+    // TODO: AI3W-1203: 3P link click analytics
+
+    onClickCallback === null || onClickCallback === void 0 ? void 0 : onClickCallback(e);
+  }, [onClickCallback]);
+
+  // TODO: AI3W-1113: Show auth button
+  const onAuthorize = fg('platform_linking_plain_hyperlink_connect_button') ?
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useCallback(() =>
+  // TODO: Need to add hyperlink type
+  actions.authorize('inline'), [actions]) : undefined;
+  if (fg('platform_linking_plain_hyperlink_connect_button')) {
+    switch (state === null || state === void 0 ? void 0 : state.status) {
+      case 'unauthorized':
+        const provider = extractSmartLinkProvider(state === null || state === void 0 ? void 0 : state.details);
+        return /*#__PURE__*/React.createElement(HyperlinkUnauthorizedView, _extends({}, props, {
+          onAuthorize: services !== null && services !== void 0 && services.length ? onAuthorize : undefined,
+          onClick: onClick,
+          provider: provider
+        }));
+      default:
+        return /*#__PURE__*/React.createElement(Hyperlink, _extends({}, props, {
+          onClick: onClick
+        }));
+    }
   }
+  return /*#__PURE__*/React.createElement(Hyperlink, _extends({}, props, {
+    onClick: onClick
+  }));
 };
+export const HyperlinkWithSmartLinkResolver = withReactErrorBoundary(withValidator(injectIntl(withIntlProvider(HyperlinkWithSmartLinkResolverInner), {
+  enforceContext: false
+}), Hyperlink), {
+  FallbackComponent: HyperlinkFallbackComponent
+});
+
+// Remove on navx-1834-refactor-resolved-hyperlink cleanup
+
 const HyperlinkResolver = ({
   href
 }) => {

package/dist/es2019/view/LinkUrl/HyperlinkResolver/resolve-hyperlink.js

@@ -3,9 +3,11 @@ import uuid from 'uuid';
 import { useAnalyticsEvents } from '../../../common/analytics/generated/use-analytics-events';
 import { useSmartCardActions } from '../../../state/actions';
 import { getDefinitionId, getExtensionKey, getResourceType } from '../../../state/helpers';
+import { useScheduledRegister } from '../../../state/hooks/use-resolve-hyperlink/useScheduledRegister';
 import { useSmartCardState } from '../../../state/store';
 import * as measure from '../../../utils/performance';
-import { useScheduledRegister } from './hooks/useScheduledRegister';
+
+// Remove on navx-1834-refactor-resolved-hyperlink cleanup
 export const ResolveHyperlink = ({
   href
 }) => {

package/dist/es2019/view/LinkUrl/HyperlinkResolver/unauthorize-view.js

@@ -0,0 +1,22 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useMemo } from 'react';
+import { FormattedMessage } from 'react-intl-next';
+import { messages } from '../../../messages';
+import { ActionButton } from '../../InlineCard/common/action-button';
+import Hyperlink from '../Hyperlink';
+const HyperlinkUnauthorizedView = ({
+  onAuthorize,
+  provider,
+  ...props
+}) => {
+  const actionButton = useMemo(() => onAuthorize ? /*#__PURE__*/React.createElement(ActionButton, {
+    onClick: onAuthorize,
+    testId: "button-connect-account"
+  }, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.connect_link_account_card_name, {
+    values: {
+      context: provider === null || provider === void 0 ? void 0 : provider.text
+    }
+  }))) : null, [onAuthorize, provider === null || provider === void 0 ? void 0 : provider.text]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Hyperlink, props), actionButton);
+};
+export default HyperlinkUnauthorizedView;

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

@@ -4,14 +4,16 @@ import { di } from 'react-magnetic-di';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
 import AKLink from '@atlaskit/link';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { withLinkClickedEvent } from '../../utils/analytics/click';
 import { LinkAnalyticsContext } from '../../utils/analytics/LinkAnalyticsContext';
-import HyperlinkResolver from './HyperlinkResolver';
+import Hyperlink from './Hyperlink';
+import HyperlinkResolver, { HyperlinkWithSmartLinkResolver } from './HyperlinkResolver';
 import LinkWarningModal from './LinkWarningModal';
 import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
 const PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "41.0.2",
+  packageVersion: "41.0.3",
   componentName: 'linkUrl'
 };
 const Anchor = withLinkClickedEvent('a');
@@ -31,8 +33,33 @@ const LinkUrl = ({
     showSafetyWarningModal,
     ...linkWarningModalProps
   } = useLinkWarningModal();
-  const Link = isLinkComponent ? LinkComponent : Anchor;
   const resolveHyperlinkFG = FeatureGates.checkGate('platform_editor_resolve_hyperlinks_killswitch');
+  if (fg('navx-1834-refactor-resolved-hyperlink')) {
+    if (resolveHyperlinkFG) {
+      const Link = enableResolve ? HyperlinkWithSmartLinkResolver : Hyperlink;
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LinkAnalyticsContext, {
+        url: href,
+        display: "url"
+      }, /*#__PURE__*/React.createElement(Link, _extends({
+        href: href,
+        isLinkComponent: isLinkComponent,
+        onClick: e => {
+          if (!checkSafety) {
+            onClick && onClick(e);
+            return;
+          }
+
+          // Only call the onClick if the link is safe
+          if (isLinkSafe(e, href)) {
+            onClick && onClick(e);
+          } else {
+            showSafetyWarningModal(e, href);
+          }
+        }
+      }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps));
+    }
+  }
+  const Link = isLinkComponent ? LinkComponent : Anchor;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LinkAnalyticsContext, {
     url: href,
     display: "url"
@@ -55,7 +82,7 @@ const LinkUrl = ({
         showSafetyWarningModal(e, href);
       }
     }
-  }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps), enableResolve && href && resolveHyperlinkFG && /*#__PURE__*/React.createElement(HyperlinkResolver, {
+  }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps), enableResolve && href && resolveHyperlinkFG && !fg('navx-1834-refactor-resolved-hyperlink') && /*#__PURE__*/React.createElement(HyperlinkResolver, {
     href: href
   }));
 };

package/dist/es2019/view/RelatedLinksModal/components/RelatedLinksBaseModal.js

@@ -1,5 +1,4 @@
 /* RelatedLinksBaseModal.tsx generated by @compiled/babel-plugin v0.36.1 */
-import _extends from "@babel/runtime/helpers/extends";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useRef } from 'react';
@@ -31,17 +30,14 @@ const RelatedLinksBaseModal = ({
     });
     onClose === null || onClose === void 0 ? void 0 : onClose();
   }, [fireEvent, onClose]);
-  return /*#__PURE__*/React.createElement(ModalTransition, null, showModal && /*#__PURE__*/React.createElement(Modal, _extends({
+  return /*#__PURE__*/React.createElement(ModalTransition, null, showModal && /*#__PURE__*/React.createElement(Modal, {
     testId: "related-links-modal",
     onClose: closeHandler,
-    width: fixedWidth
-  }, fg('navx-1304-related-links-remove-false-autofocus') ? {} : {
-    autoFocus: false
-  }, {
+    width: fixedWidth,
     shouldReturnFocus: false,
     onOpenComplete: openCompleteHandler,
     height: '504px'
-  }), /*#__PURE__*/React.createElement(ModalHeader, {
+  }, /*#__PURE__*/React.createElement(ModalHeader, {
     hasCloseButton: fg('navx-1483-a11y-close-button-in-modal-updates')
   }, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(FormattedMessage, messages.related_links_modal_title))), /*#__PURE__*/React.createElement(ModalBody, null, children), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
     appearance: "primary",

package/dist/es2019/view/common/intl-provider/index.js

@@ -0,0 +1,13 @@
+import React from 'react';
+import { IntlProvider } from 'react-intl-next';
+
+/**
+ * HOC to wrap component with IntlProvider if not available
+ */
+const withIntlProvider = Component => props => {
+  const content = /*#__PURE__*/React.createElement(Component, props);
+  return props !== null && props !== void 0 && props.intl ? content : /*#__PURE__*/React.createElement(IntlProvider, {
+    locale: "en"
+  }, content);
+};
+export default withIntlProvider;

package/dist/esm/state/hooks/use-resolve-hyperlink/index.js

@@ -0,0 +1,63 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import { useEffect, useState } from 'react';
+import uuid from 'uuid';
+import { useAnalyticsEvents } from '../../../common/analytics/generated/use-analytics-events';
+import * as measure from '../../../utils/performance';
+import { useSmartCardActions } from '../../actions';
+import { getDefinitionId, getExtensionKey, getResourceType } from '../../helpers';
+import { useSmartCardState } from '../../store';
+import { useScheduledRegister } from './useScheduledRegister';
+var useResolveHyperlink = function useResolveHyperlink(_ref) {
+  var href = _ref.href;
+  var _useState = useState(function () {
+      return uuid();
+    }),
+    _useState2 = _slicedToArray(_useState, 1),
+    id = _useState2[0];
+  var state = useSmartCardState(href);
+  var definitionId = getDefinitionId(state.details);
+  var extensionKey = getExtensionKey(state.details);
+  var resourceType = getResourceType(state.details);
+  var actions = useSmartCardActions(id, href);
+  var scheduledRegister = useScheduledRegister(href, actions.register);
+  var _useAnalyticsEvents = useAnalyticsEvents(),
+    fireEvent = _useAnalyticsEvents.fireEvent;
+  useEffect(function () {
+    scheduledRegister().catch(function (error) {
+      throw error;
+    });
+  }, [scheduledRegister]);
+  useEffect(function () {
+    measure.mark(id, state.status);
+    if (state.status !== 'pending' && state.status !== 'resolving') {
+      var _state$error, _state$error2;
+      measure.create(id, state.status);
+      if (state.status === 'resolved') {
+        var _measure$getMeasure$d, _measure$getMeasure;
+        fireEvent('operational.hyperlink.resolved', {
+          definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null,
+          extensionKey: extensionKey !== null && extensionKey !== void 0 ? extensionKey : null,
+          resourceType: resourceType !== null && resourceType !== void 0 ? resourceType : null,
+          duration: (_measure$getMeasure$d = (_measure$getMeasure = measure.getMeasure(id, state.status)) === null || _measure$getMeasure === void 0 ? void 0 : _measure$getMeasure.duration) !== null && _measure$getMeasure$d !== void 0 ? _measure$getMeasure$d : null
+        });
+      } else if (((_state$error = state.error) === null || _state$error === void 0 ? void 0 : _state$error.type) !== 'ResolveUnsupportedError' && ((_state$error2 = state.error) === null || _state$error2 === void 0 ? void 0 : _state$error2.type) !== 'UnsupportedError') {
+        fireEvent('operational.hyperlink.unresolved', {
+          definitionId: definitionId !== null && definitionId !== void 0 ? definitionId : null,
+          extensionKey: extensionKey !== null && extensionKey !== void 0 ? extensionKey : null,
+          resourceType: resourceType !== null && resourceType !== void 0 ? resourceType : null,
+          reason: state.status,
+          error: state.error === undefined ? null : {
+            name: state.error.name,
+            kind: state.error.kind,
+            type: state.error.type
+          }
+        });
+      }
+    }
+  }, [id, state.status, state.error, definitionId, extensionKey, resourceType, fireEvent]);
+  return {
+    state: state,
+    actions: actions
+  };
+};
+export default useResolveHyperlink;

package/dist/esm/state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator.js

@@ -0,0 +1,29 @@
+import { useContext } from 'react';
+import FeatureGates from '@atlaskit/feature-gate-js-client';
+import { SmartCardContext } from '@atlaskit/link-provider';
+export var isSharePointDomain = function isSharePointDomain(href) {
+  try {
+    var hostname = new URL(href).hostname.toLowerCase();
+    return hostname.includes('sharepoint.com') || hostname.includes('onedrive.live.com');
+  } catch (_unused) {
+    return false;
+  }
+};
+export var isGoogleDomain = function isGoogleDomain(href) {
+  try {
+    var hostname = new URL(href).hostname.toLowerCase();
+    return hostname.includes('docs.google.com') || hostname.includes('drive.google.com');
+  } catch (_unused2) {
+    return false;
+  }
+};
+var useResolveHyperlinkValidator = function useResolveHyperlinkValidator() {
+  var href = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var hasSmartCardProvider = !!useContext(SmartCardContext);
+  var isSharePointResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_confluence', 'isEnabled', false) || FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_jira', 'isEnabled', false);
+  var isGoogleResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_google_hyperlinks', 'isEnabled', false);
+  var shouldResolveSharePoint = isSharePointDomain(href) && isSharePointResolveEnabled;
+  var shouldResolveGoogle = isGoogleDomain(href) && isGoogleResolveEnabled;
+  return hasSmartCardProvider && (shouldResolveSharePoint || shouldResolveGoogle);
+};
+export default useResolveHyperlinkValidator;

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

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

package/dist/esm/view/EmbedModal/components/link-info/index.js

@@ -2,7 +2,7 @@
 import "./index.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useMemo } from 'react';
-import { FormattedMessage } from 'react-intl-next';
+import { FormattedMessage, useIntl } from 'react-intl-next';
 import Heading from '@atlaskit/heading';
 import DownloadIcon from '@atlaskit/icon/core/download';
 import FullscreenExitIcon from '@atlaskit/icon/core/fullscreen-exit';
@@ -38,6 +38,8 @@ var LinkInfo = function LinkInfo(_ref) {
     title = _ref.title;
   var _useModal = useModal(),
     onClose = _useModal.onClose;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
   var downloadButton = useMemo(function () {
     if (onDownloadButtonClick) {
       return /*#__PURE__*/React.createElement(LinkInfoButton, {
@@ -127,7 +129,7 @@ var LinkInfo = function LinkInfo(_ref) {
     testId: "".concat(testId, "-close-tooltip")
   }, /*#__PURE__*/React.createElement(CloseButton, {
     onClick: onClose,
-    label: messages.preview_close.defaultMessage,
+    label: formatMessage(messages.preview_close),
     testId: "".concat(testId, "-close-button")
   })) : /*#__PURE__*/React.createElement(LinkInfoButton, {
     content: /*#__PURE__*/React.createElement(FormattedMessage, messages.preview_close),

package/dist/esm/view/LinkUrl/Hyperlink/index.js

@@ -0,0 +1,25 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["href", "children", "testId", "isLinkComponent"];
+import React from 'react';
+import AKLink from '@atlaskit/link';
+import { withLinkClickedEvent } from '../../../utils/analytics/click';
+var Anchor = withLinkClickedEvent('a');
+export var LinkComponent = withLinkClickedEvent(AKLink);
+var Hyperlink = function Hyperlink(_ref) {
+  var href = _ref.href,
+    children = _ref.children,
+    testId = _ref.testId,
+    _ref$isLinkComponent = _ref.isLinkComponent,
+    isLinkComponent = _ref$isLinkComponent === void 0 ? false : _ref$isLinkComponent,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var Link = isLinkComponent ? LinkComponent : Anchor;
+  return /*#__PURE__*/React.createElement(Link, _extends({}, isLinkComponent ? {
+    testId: testId
+  } : {
+    'data-testid': testId
+  }, {
+    href: href || ''
+  }, props), children);
+};
+export default Hyperlink;

package/dist/esm/view/LinkUrl/HyperlinkResolver/error-boundary.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
+// Remove on navx-1834-refactor-resolved-hyperlink cleanup
 var withErrorBoundary = function withErrorBoundary(Component) {
   return function (props) {
     return /*#__PURE__*/React.createElement(ErrorBoundary, {

package/dist/esm/view/LinkUrl/HyperlinkResolver/index.js

@@ -1,26 +1,83 @@
-import React, { useContext } from 'react';
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["onClick"];
+import React, { useCallback, useContext } from 'react';
+import { withErrorBoundary as withReactErrorBoundary } from 'react-error-boundary';
+import { injectIntl } from 'react-intl-next';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
+import { extractSmartLinkProvider } from '@atlaskit/link-extractors';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SmartCardContext } from '../../../state';
+import { getServices } from '../../../state/helpers';
+import useResolveHyperlink from '../../../state/hooks/use-resolve-hyperlink';
+import useResolveHyperlinkValidator, { isGoogleDomain, isSharePointDomain } from '../../../state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator';
+import withIntlProvider from '../../common/intl-provider';
+import Hyperlink from '../Hyperlink';
 import withErrorBoundary from './error-boundary';
 import { ResolveHyperlink } from './resolve-hyperlink';
-var isSharePointDomain = function isSharePointDomain(href) {
-  try {
-    var hostname = new URL(href).hostname.toLowerCase();
-    return hostname.includes('sharepoint.com') || hostname.includes('onedrive.live.com');
-  } catch (_unused) {
-    return false;
-  }
+import HyperlinkUnauthorizedView from './unauthorize-view';
+var HyperlinkFallbackComponent = function HyperlinkFallbackComponent() {
+  return null;
+};
+var withValidator = function withValidator(Component, DefaultComponent) {
+  return function (props) {
+    var shouldResolveHyperlink = useResolveHyperlinkValidator(props === null || props === void 0 ? void 0 : props.href);
+    return shouldResolveHyperlink ? /*#__PURE__*/React.createElement(Component, props) : /*#__PURE__*/React.createElement(DefaultComponent, props);
+  };
 };
-var isGoogleDomain = function isGoogleDomain(href) {
-  try {
-    var hostname = new URL(href).hostname.toLowerCase();
-    return hostname.includes('docs.google.com') || hostname.includes('drive.google.com');
-  } catch (_unused2) {
-    return false;
+var HyperlinkWithSmartLinkResolverInner = function HyperlinkWithSmartLinkResolverInner(_ref) {
+  var onClickCallback = _ref.onClick,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _useResolveHyperlink = useResolveHyperlink({
+      href: props.href || ''
+    }),
+    actions = _useResolveHyperlink.actions,
+    state = _useResolveHyperlink.state;
+  var services = getServices(state === null || state === void 0 ? void 0 : state.details);
+  var onClick = useCallback(function (e) {
+    // TODO: AI3W-1203: 3P link click analytics
+
+    onClickCallback === null || onClickCallback === void 0 || onClickCallback(e);
+  }, [onClickCallback]);
+
+  // TODO: AI3W-1113: Show auth button
+  var onAuthorize = fg('platform_linking_plain_hyperlink_connect_button') ?
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useCallback(function () {
+    return (
+      // TODO: Need to add hyperlink type
+      actions.authorize('inline')
+    );
+  }, [actions]) : undefined;
+  if (fg('platform_linking_plain_hyperlink_connect_button')) {
+    switch (state === null || state === void 0 ? void 0 : state.status) {
+      case 'unauthorized':
+        var provider = extractSmartLinkProvider(state === null || state === void 0 ? void 0 : state.details);
+        return /*#__PURE__*/React.createElement(HyperlinkUnauthorizedView, _extends({}, props, {
+          onAuthorize: services !== null && services !== void 0 && services.length ? onAuthorize : undefined,
+          onClick: onClick,
+          provider: provider
+        }));
+      default:
+        return /*#__PURE__*/React.createElement(Hyperlink, _extends({}, props, {
+          onClick: onClick
+        }));
+    }
   }
+  return /*#__PURE__*/React.createElement(Hyperlink, _extends({}, props, {
+    onClick: onClick
+  }));
 };
-var HyperlinkResolver = function HyperlinkResolver(_ref) {
-  var href = _ref.href;
+export var HyperlinkWithSmartLinkResolver = withReactErrorBoundary(withValidator(injectIntl(withIntlProvider(HyperlinkWithSmartLinkResolverInner), {
+  enforceContext: false
+}), Hyperlink), {
+  FallbackComponent: HyperlinkFallbackComponent
+});
+
+// Remove on navx-1834-refactor-resolved-hyperlink cleanup
+
+var HyperlinkResolver = function HyperlinkResolver(_ref2) {
+  var href = _ref2.href;
   var hasSmartCardProvider = !!useContext(SmartCardContext);
   var isSharePointResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_confluence', 'isEnabled', false) || FeatureGates.getExperimentValue('platform_editor_resolve_hyperlinks_jira', 'isEnabled', false);
   var isGoogleResolveEnabled = FeatureGates.getExperimentValue('platform_editor_resolve_google_hyperlinks', 'isEnabled', false);

package/dist/esm/view/LinkUrl/HyperlinkResolver/resolve-hyperlink.js

@@ -4,9 +4,11 @@ import uuid from 'uuid';
 import { useAnalyticsEvents } from '../../../common/analytics/generated/use-analytics-events';
 import { useSmartCardActions } from '../../../state/actions';
 import { getDefinitionId, getExtensionKey, getResourceType } from '../../../state/helpers';
+import { useScheduledRegister } from '../../../state/hooks/use-resolve-hyperlink/useScheduledRegister';
 import { useSmartCardState } from '../../../state/store';
 import * as measure from '../../../utils/performance';
-import { useScheduledRegister } from './hooks/useScheduledRegister';
+
+// Remove on navx-1834-refactor-resolved-hyperlink cleanup
 export var ResolveHyperlink = function ResolveHyperlink(_ref) {
   var href = _ref.href;
   var _useState = useState(function () {

package/dist/esm/view/LinkUrl/HyperlinkResolver/unauthorize-view.js

@@ -0,0 +1,25 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["onAuthorize", "provider"];
+import React, { useMemo } from 'react';
+import { FormattedMessage } from 'react-intl-next';
+import { messages } from '../../../messages';
+import { ActionButton } from '../../InlineCard/common/action-button';
+import Hyperlink from '../Hyperlink';
+var HyperlinkUnauthorizedView = function HyperlinkUnauthorizedView(_ref) {
+  var onAuthorize = _ref.onAuthorize,
+    provider = _ref.provider,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var actionButton = useMemo(function () {
+    return onAuthorize ? /*#__PURE__*/React.createElement(ActionButton, {
+      onClick: onAuthorize,
+      testId: "button-connect-account"
+    }, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.connect_link_account_card_name, {
+      values: {
+        context: provider === null || provider === void 0 ? void 0 : provider.text
+      }
+    }))) : null;
+  }, [onAuthorize, provider === null || provider === void 0 ? void 0 : provider.text]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Hyperlink, props), actionButton);
+};
+export default HyperlinkUnauthorizedView;

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

@@ -7,14 +7,16 @@ import { di } from 'react-magnetic-di';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
 import AKLink from '@atlaskit/link';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { withLinkClickedEvent } from '../../utils/analytics/click';
 import { LinkAnalyticsContext } from '../../utils/analytics/LinkAnalyticsContext';
-import HyperlinkResolver from './HyperlinkResolver';
+import Hyperlink from './Hyperlink';
+import HyperlinkResolver, { HyperlinkWithSmartLinkResolver } from './HyperlinkResolver';
 import LinkWarningModal from './LinkWarningModal';
 import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "41.0.2",
+  packageVersion: "41.0.3",
   componentName: 'linkUrl'
 };
 var Anchor = withLinkClickedEvent('a');
@@ -36,8 +38,33 @@ var LinkUrl = function LinkUrl(_ref) {
     isLinkSafe = _useLinkWarningModal.isLinkSafe,
     showSafetyWarningModal = _useLinkWarningModal.showSafetyWarningModal,
     linkWarningModalProps = _objectWithoutProperties(_useLinkWarningModal, _excluded2);
-  var Link = isLinkComponent ? LinkComponent : Anchor;
   var resolveHyperlinkFG = FeatureGates.checkGate('platform_editor_resolve_hyperlinks_killswitch');
+  if (fg('navx-1834-refactor-resolved-hyperlink')) {
+    if (resolveHyperlinkFG) {
+      var _Link = enableResolve ? HyperlinkWithSmartLinkResolver : Hyperlink;
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LinkAnalyticsContext, {
+        url: href,
+        display: "url"
+      }, /*#__PURE__*/React.createElement(_Link, _extends({
+        href: href,
+        isLinkComponent: isLinkComponent,
+        onClick: function onClick(e) {
+          if (!checkSafety) {
+            _onClick && _onClick(e);
+            return;
+          }
+
+          // Only call the onClick if the link is safe
+          if (isLinkSafe(e, href)) {
+            _onClick && _onClick(e);
+          } else {
+            showSafetyWarningModal(e, href);
+          }
+        }
+      }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps));
+    }
+  }
+  var Link = isLinkComponent ? LinkComponent : Anchor;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LinkAnalyticsContext, {
     url: href,
     display: "url"
@@ -60,7 +87,7 @@ var LinkUrl = function LinkUrl(_ref) {
         showSafetyWarningModal(e, href);
       }
     }
-  }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps), enableResolve && href && resolveHyperlinkFG && /*#__PURE__*/React.createElement(HyperlinkResolver, {
+  }, props), children)), checkSafety && /*#__PURE__*/React.createElement(LinkWarningModal, linkWarningModalProps), enableResolve && href && resolveHyperlinkFG && !fg('navx-1834-refactor-resolved-hyperlink') && /*#__PURE__*/React.createElement(HyperlinkResolver, {
     href: href
   }));
 };