@atlaskit/editor-plugin-card 0.14.17 → 0.14.19

package/dist/es2019/nodeviews/inlineCardWithAwareness.js

@@ -1,24 +1,9 @@
-/** @jsx jsx */
-import { memo, useCallback, useMemo, useState } from 'react';
-import { css, jsx } from '@emotion/react';
+import React, { memo, useCallback, useMemo, useState } from 'react';
 import rafSchedule from 'raf-schd';
-import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { Card as SmartCard } from '@atlaskit/smart-card';
-import useLinkUpgradeDiscoverability from '../common/hooks/useLinkUpgradeDiscoverability';
-import { isLocalStorageKeyDiscovered, LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK, LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR, markLocalStorageKeyDiscovered, ONE_DAY_IN_MILLISECONDS } from '../common/local-storage';
-import { DiscoveryPulse } from '../common/pulse';
 import { registerCard, registerRemoveOverlay } from '../pm-plugins/actions';
-import InlineCardOverlay from '../ui/InlineCardOverlay';
-import { getResolvedAttributesFromStore } from '../utils';
-// editor adds a standard line-height that is bigger than an inline smart link
-// due to that the link has a bit of white space around it, which doesn't look right when there is pulse around it
-const loaderWrapperStyles = css({
-  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
-  '.loader-wrapper': {
-    lineHeight: 'normal'
-  }
-});
+import { AwarenessWrapper } from '../ui/AwarenessWrapper';
 const InlineCard = ({
   node,
   cardContext,
@@ -31,44 +16,13 @@ const InlineCard = ({
   pluginInjectionApi,
   isSelected = false
 }) => {
-  var _cardContext$value2;
   const {
     url,
     data
   } = node.attrs;
-
-  // BEGIN: Awareness (To be revisited in EDM-8508)
   const [isHovered, setIsHovered] = useState(false);
   const [isInserted, setIsInserted] = useState(false);
   const [isResolvedViewRendered, setIsResolvedViewRendered] = useState(false);
-  const linkPosition = useMemo(() => {
-    if (!getPos || typeof getPos === 'boolean') {
-      return undefined;
-    }
-    const pos = getPos();
-    return typeof pos === 'number' ? pos : undefined;
-  }, [getPos]);
-  const {
-    shouldShowLinkPulse,
-    shouldShowToolbarPulse,
-    shouldShowLinkOverlay,
-    isLinkMostRecentlyInserted
-  } = useLinkUpgradeDiscoverability({
-    url,
-    linkPosition: linkPosition || -1,
-    cardContext: cardContext === null || cardContext === void 0 ? void 0 : cardContext.value,
-    pluginInjectionApi,
-    isOverlayEnabled,
-    isPulseEnabled
-  });
-
-  // If the toolbar pulse has not yet been invalidated and this is a case where we will be showing it,
-  // we need to invalidate the link pulse too. Toolbar pulse will be invalidated in the corresponding component.
-  if (isSelected && shouldShowToolbarPulse && !isLocalStorageKeyDiscovered(LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR)) {
-    markLocalStorageKeyDiscovered(LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK);
-  }
-  // END: Awareness
-
   const scrollContainer = useMemo(() => findOverflowScrollParent(view.dom) || undefined, [view.dom]);
   const onResolve = useCallback(data => {
     if (!getPos || typeof getPos === 'boolean') {
@@ -98,8 +52,7 @@ const InlineCard = ({
     if (title) {
       setIsResolvedViewRendered(true);
     }
-    setIsInserted(isLinkMostRecentlyInserted);
-  }, [view, getPos, isLinkMostRecentlyInserted]);
+  }, [view, getPos]);
   const onError = useCallback(data => {
     const {
       url,
@@ -112,7 +65,21 @@ const InlineCard = ({
       url
     });
   }, [onResolve]);
-  const innerCard = useMemo(() => jsx(SmartCard, {
+
+  // Begin Upgrade Awareness related code
+  const markMostRecentlyInsertedLink = useCallback(isLinkMostRecentlyInserted => {
+    if (isOverlayEnabled) {
+      setIsInserted(isLinkMostRecentlyInserted);
+    }
+  }, [isOverlayEnabled]);
+  const setOverlayHoveredStyles = useCallback(isHovered => {
+    if (isOverlayEnabled) {
+      setIsHovered(isHovered);
+    }
+  }, [isOverlayEnabled]);
+  //  End Upgrade Awareness related code
+
+  const innerCard = useMemo(() => /*#__PURE__*/React.createElement(SmartCard, {
     key: url,
     url: url,
     data: data,
@@ -125,35 +92,28 @@ const InlineCard = ({
     showServerActions: showServerActions,
     isHovered: isHovered
   }), [data, isHovered, onError, onResolve, scrollContainer, showServerActions, url, useAlternativePreloader]);
-
-  // BEGIN: Awareness (To be revisited in EDM-8508)
-  const cardWithOverlay = useMemo(() => shouldShowLinkOverlay ? jsx(InlineCardOverlay, {
-    isSelected: isSelected,
-    isVisible: isResolvedViewRendered && (isInserted || isHovered || isSelected),
-    onMouseEnter: () => setIsHovered(true),
-    onMouseLeave: () => setIsHovered(false),
-    url: url
-  }, innerCard) : innerCard, [innerCard, isHovered, isResolvedViewRendered, isSelected, isInserted, shouldShowLinkOverlay, url]);
   const card = useMemo(() => {
-    var _cardContext$value;
-    return jsx("span", {
-      css: shouldShowLinkPulse && loaderWrapperStyles,
+    return isOverlayEnabled || isPulseEnabled ? /*#__PURE__*/React.createElement(AwarenessWrapper, {
+      isOverlayEnabled: isOverlayEnabled,
+      isPulseEnabled: isPulseEnabled,
+      cardContext: cardContext,
+      getPos: getPos,
+      isHovered: isHovered,
+      isInserted: isInserted,
+      url: url,
+      isSelected: isSelected,
+      isResolvedViewRendered: isResolvedViewRendered,
+      markMostRecentlyInsertedLink: markMostRecentlyInsertedLink,
+      pluginInjectionApi: pluginInjectionApi,
+      setOverlayHoveredStyles: setOverlayHoveredStyles
+    }, innerCard) : /*#__PURE__*/React.createElement("span", {
       className: "card"
-    }, shouldShowLinkPulse ? jsx(AnalyticsContext, {
-      data: {
-        attributes: getResolvedAttributesFromStore(url, 'inline', cardContext === null || cardContext === void 0 ? void 0 : (_cardContext$value = cardContext.value) === null || _cardContext$value === void 0 ? void 0 : _cardContext$value.store)
-      }
-    }, jsx(DiscoveryPulse, {
-      localStorageKey: LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK,
-      localStorageKeyExpirationInMs: ONE_DAY_IN_MILLISECONDS,
-      discoveryMode: "start"
-    }, cardWithOverlay)) : cardWithOverlay);
-  }, [shouldShowLinkPulse, cardWithOverlay, url, cardContext === null || cardContext === void 0 ? void 0 : (_cardContext$value2 = cardContext.value) === null || _cardContext$value2 === void 0 ? void 0 : _cardContext$value2.store]);
-  // END: Awareness
+    }, innerCard);
+  }, [cardContext, getPos, innerCard, isHovered, isInserted, isOverlayEnabled, isPulseEnabled, isResolvedViewRendered, isSelected, markMostRecentlyInsertedLink, pluginInjectionApi, setOverlayHoveredStyles, url]);
 
   // [WS-2307]: we only render card wrapped into a Provider when the value is ready,
   // otherwise if we got data, we can render the card directly since it doesn't need the Provider
-  return cardContext && cardContext.value ? jsx(cardContext.Provider, {
+  return cardContext && cardContext.value ? /*#__PURE__*/React.createElement(cardContext.Provider, {
     value: cardContext.value
   }, card) : data ? card : null;
 };

package/dist/es2019/pm-plugins/main.js

@@ -45,6 +45,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
     allowBlockCards
   } = options;
   const enableInlineUpgradeFeatures = !!showUpgradeDiscoverability && platform !== 'mobile';
+  const shouldUseUpgradeFeatures = getBooleanFF('platform.linking-platform.smart-card.inline-switcher') && enableInlineUpgradeFeatures;
   const inlineCardViewProducer = getInlineNodeViewProducer({
     pmPluginFactoryParams,
     Component: InlineCardNodeView,
@@ -88,7 +89,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
         if (!meta) {
           return pluginStateWithUpdatedPos;
         }
-        if (!getBooleanFF('platform.linking-platform.smart-card.inline-switcher')) {
+        if (!shouldUseUpgradeFeatures) {
           return reducer(pluginStateWithUpdatedPos, meta);
         }
         const newState = reducer(pluginStateWithUpdatedPos, meta);
@@ -96,7 +97,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
         // the code below is related to the "Inline Switcher" project, for more information pls see EDM-7984
         const isSingleInlineLink = (pluginState === null || pluginState === void 0 ? void 0 : (_pluginState$requests = pluginState.requests) === null || _pluginState$requests === void 0 ? void 0 : _pluginState$requests.length) === 1 && pluginState.requests[0].appearance === 'inline';
         const isSmartLinkPulseDiscovered = isLocalStorageKeyDiscovered(LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK);
-        if (meta.type !== 'RESOLVE' || !enableInlineUpgradeFeatures || !isSingleInlineLink) {
+        if (meta.type !== 'RESOLVE' || !isSingleInlineLink) {
           return newState;
         }
         const linkPosition = pluginState.requests[0].pos;
@@ -246,7 +247,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
           return new EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
         }
       },
-      ...(getBooleanFF('platform.linking-platform.smart-card.inline-switcher') && {
+      ...(shouldUseUpgradeFeatures && {
         handleKeyDown: view => {
           handleAwarenessOverlay(view);
           return false;

package/dist/es2019/ui/AwarenessWrapper/index.js

@@ -0,0 +1,91 @@
+/** @jsx jsx */
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { css, jsx } from '@emotion/react';
+import { AnalyticsContext } from '@atlaskit/analytics-next';
+import useLinkUpgradeDiscoverability from '../../common/hooks/useLinkUpgradeDiscoverability';
+import { isLocalStorageKeyDiscovered, LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK, LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR, markLocalStorageKeyDiscovered, ONE_DAY_IN_MILLISECONDS } from '../../common/local-storage';
+import { getResolvedAttributesFromStore } from '../../utils';
+import InlineCardOverlay from '../InlineCardOverlay';
+import { DiscoveryPulse } from '../Pulse';
+// editor adds a standard line-height that is bigger than an inline smart link
+// due to that the link has a bit of white space around it, which doesn't look right when there is pulse around it
+const loaderWrapperStyles = css({
+  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
+  '.loader-wrapper': {
+    lineHeight: 'normal'
+  }
+});
+export const AwarenessWrapper = ({
+  cardContext,
+  children,
+  getPos,
+  isInserted,
+  isOverlayEnabled,
+  isSelected,
+  isResolvedViewRendered,
+  isPulseEnabled,
+  markMostRecentlyInsertedLink,
+  pluginInjectionApi,
+  setOverlayHoveredStyles,
+  url
+}) => {
+  var _cardContext$value2;
+  const [isHovered, setIsHovered] = useState(false);
+  const linkPosition = useMemo(() => {
+    if (!getPos || typeof getPos === 'boolean') {
+      return undefined;
+    }
+    const pos = getPos();
+    return typeof pos === 'number' ? pos : undefined;
+  }, [getPos]);
+  const {
+    shouldShowLinkPulse,
+    shouldShowToolbarPulse,
+    shouldShowLinkOverlay,
+    isLinkMostRecentlyInserted
+  } = useLinkUpgradeDiscoverability({
+    url,
+    linkPosition: linkPosition || -1,
+    cardContext: cardContext === null || cardContext === void 0 ? void 0 : cardContext.value,
+    pluginInjectionApi,
+    isOverlayEnabled,
+    isPulseEnabled
+  });
+
+  // If the toolbar pulse has not yet been invalidated and this is a case where we will be showing it,
+  // we need to invalidate the link pulse too. Toolbar pulse will be invalidated in the corresponding component.
+  if (isSelected && shouldShowToolbarPulse && !isLocalStorageKeyDiscovered(LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR)) {
+    markLocalStorageKeyDiscovered(LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK);
+  }
+  useEffect(() => {
+    if (shouldShowLinkOverlay && isLinkMostRecentlyInserted) {
+      markMostRecentlyInsertedLink(true);
+    }
+  }, [isLinkMostRecentlyInserted, markMostRecentlyInsertedLink, shouldShowLinkOverlay]);
+  const handleOverlayChange = useCallback(isHovered => {
+    setIsHovered(isHovered);
+    setOverlayHoveredStyles(isHovered);
+  }, [setOverlayHoveredStyles]);
+  const cardWithOverlay = useMemo(() => shouldShowLinkOverlay ? jsx(InlineCardOverlay, {
+    isSelected: isSelected,
+    isVisible: isResolvedViewRendered && (isInserted || isHovered || isSelected),
+    onMouseEnter: () => handleOverlayChange(true),
+    onMouseLeave: () => handleOverlayChange(false),
+    url: url
+  }, children) : children, [shouldShowLinkOverlay, isSelected, isResolvedViewRendered, isInserted, isHovered, url, children, handleOverlayChange]);
+  return useMemo(() => {
+    var _cardContext$value;
+    return jsx("span", {
+      css: shouldShowLinkPulse && loaderWrapperStyles,
+      className: "card"
+    }, shouldShowLinkPulse ? jsx(AnalyticsContext, {
+      data: {
+        attributes: getResolvedAttributesFromStore(url, 'inline', cardContext === null || cardContext === void 0 ? void 0 : (_cardContext$value = cardContext.value) === null || _cardContext$value === void 0 ? void 0 : _cardContext$value.store)
+      }
+    }, jsx(DiscoveryPulse, {
+      localStorageKey: LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK,
+      localStorageKeyExpirationInMs: ONE_DAY_IN_MILLISECONDS,
+      discoveryMode: "start"
+    }, cardWithOverlay)) : cardWithOverlay);
+  }, [shouldShowLinkPulse, url, cardContext === null || cardContext === void 0 ? void 0 : (_cardContext$value2 = cardContext.value) === null || _cardContext$value2 === void 0 ? void 0 : _cardContext$value2.store, cardWithOverlay]);
+};

package/dist/es2019/ui/EditorLinkingPlatformAnalytics/common.js

@@ -21,8 +21,11 @@ const withHistoryMethod = fn => {
   };
 };
 export const getMethod = withHistoryMethod(({
-  inputMethod
+  inputMethod,
+  sourceEvent
 }) => {
+  var _inputMethod, _payload, _payload$attributes;
+  inputMethod = (_inputMethod = inputMethod) !== null && _inputMethod !== void 0 ? _inputMethod : sourceEvent === null || sourceEvent === void 0 ? void 0 : (_payload = sourceEvent.payload) === null || _payload === void 0 ? void 0 : (_payload$attributes = _payload.attributes) === null || _payload$attributes === void 0 ? void 0 : _payload$attributes.inputMethod;
   switch (inputMethod) {
     case INPUT_METHOD.CLIPBOARD:
       return 'editor_paste';
@@ -35,6 +38,8 @@ export const getMethod = withHistoryMethod(({
       return 'linkpicker_searchResult';
     case INPUT_METHOD.MANUAL:
       return 'linkpicker_manual';
+    case INPUT_METHOD.DATASOURCE:
+      return 'datasource_config';
     default:
       return 'unknown';
   }

package/dist/es2019/ui/LinkToolbarAppearance.js

@@ -8,9 +8,9 @@ import nodeNames, { cardMessages as messages } from '@atlaskit/editor-common/mes
 import { isSupportedInParent } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR } from '../common/local-storage';
-import { DiscoveryPulse } from '../common/pulse';
 import { shouldRenderToolbarPulse } from '../toolbar';
 import { getResolvedAttributesFromStore } from '../utils';
+import { DiscoveryPulse } from './Pulse';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class LinkToolbarAppearance extends React.Component {
   constructor(...args) {

package/dist/es2019/{common/pulse → ui/Pulse}/index.js

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { Pulse } from '@atlaskit/linking-common';
-import { isLocalStorageKeyDiscovered, markLocalStorageKeyDiscovered } from '../local-storage';
+import { isLocalStorageKeyDiscovered, markLocalStorageKeyDiscovered } from '../../common/local-storage';
 export const DiscoveryPulse = ({
   children,
   localStorageKey,

package/dist/esm/nodeviews/inlineCard.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -116,7 +117,6 @@ _defineProperty(InlineCardComponent, "contextTypes", {
 var WrappedInlineCard = Card(InlineCardComponent, UnsupportedInline);
 var WrappedInlineCardWithAwareness = Card(InlineCardWithAwareness, UnsupportedInline);
 export function InlineCardNodeView(props) {
-  var _view$state$selection, _view$state$selection2;
   var useAlternativePreloader = props.useAlternativePreloader,
     node = props.node,
     view = props.view,
@@ -135,26 +135,24 @@ export function InlineCardNodeView(props) {
       useAlternativePreloader: useAlternativePreloader
     });
   }
-
-  // BEGIN: Awareness (To be revisited in EDM-8508)
-  var editorState = view.state;
-  var linkPosition = getPos && typeof getPos() === 'number' ? getPos() : undefined;
-  var canBeUpgradedToEmbed = !!linkPosition && allowEmbeds ? isEmbedSupportedAtPosition(linkPosition, editorState, 'inline') : false;
-  var canBeUpgradedToBlock = !!linkPosition && allowBlockCards ? isBlockSupportedAtPosition(linkPosition, editorState, 'inline') : false;
-  var isPulseEnabled = enableInlineUpgradeFeatures && canBeUpgradedToEmbed;
-  var isOverlayEnabled = enableInlineUpgradeFeatures && (canBeUpgradedToEmbed || canBeUpgradedToBlock);
-  var isSelected = view.state.selection instanceof NodeSelection && ((_view$state$selection = view.state.selection) === null || _view$state$selection === void 0 || (_view$state$selection = _view$state$selection.node) === null || _view$state$selection === void 0 ? void 0 : _view$state$selection.type) === view.state.schema.nodes.inlineCard && ((_view$state$selection2 = view.state.selection) === null || _view$state$selection2 === void 0 ? void 0 : _view$state$selection2.from) === getPos();
-  // END: Awareness
-
-  return /*#__PURE__*/React.createElement(WrappedInlineCardWithAwareness, {
+  return /*#__PURE__*/React.createElement(WrappedInlineCardWithAwareness, _extends({
     node: node,
     view: view,
     getPos: getPos,
     showServerActions: showServerActions,
     useAlternativePreloader: useAlternativePreloader,
-    isOverlayEnabled: isOverlayEnabled,
-    isPulseEnabled: isPulseEnabled,
-    pluginInjectionApi: pluginInjectionApi,
+    pluginInjectionApi: pluginInjectionApi
+  }, enableInlineUpgradeFeatures && getAwarenessProps(view.state, getPos, allowEmbeds, allowBlockCards)));
+}
+var getAwarenessProps = function getAwarenessProps(editorState, getPos, allowEmbeds, allowBlockCards) {
+  var _editorState$selectio, _editorState$selectio2;
+  var linkPosition = getPos && typeof getPos() === 'number' ? getPos() : undefined;
+  var canBeUpgradedToEmbed = !!linkPosition && allowEmbeds ? isEmbedSupportedAtPosition(linkPosition, editorState, 'inline') : false;
+  var canBeUpgradedToBlock = !!linkPosition && allowBlockCards ? isBlockSupportedAtPosition(linkPosition, editorState, 'inline') : false;
+  var isSelected = editorState.selection instanceof NodeSelection && ((_editorState$selectio = editorState.selection) === null || _editorState$selectio === void 0 || (_editorState$selectio = _editorState$selectio.node) === null || _editorState$selectio === void 0 ? void 0 : _editorState$selectio.type) === editorState.schema.nodes.inlineCard && ((_editorState$selectio2 = editorState.selection) === null || _editorState$selectio2 === void 0 ? void 0 : _editorState$selectio2.from) === getPos();
+  return {
+    isPulseEnabled: canBeUpgradedToEmbed,
+    isOverlayEnabled: canBeUpgradedToEmbed || canBeUpgradedToBlock,
     isSelected: isSelected
-  });
-}
+  };
+};

package/dist/esm/nodeviews/inlineCardWithAwareness.js

@@ -1,27 +1,11 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-/** @jsx jsx */
-import { memo, useCallback, useMemo, useState } from 'react';
-import { css, jsx } from '@emotion/react';
+import React, { memo, useCallback, useMemo, useState } from 'react';
 import rafSchedule from 'raf-schd';
-import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { Card as SmartCard } from '@atlaskit/smart-card';
-import useLinkUpgradeDiscoverability from '../common/hooks/useLinkUpgradeDiscoverability';
-import { isLocalStorageKeyDiscovered, LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK, LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR, markLocalStorageKeyDiscovered, ONE_DAY_IN_MILLISECONDS } from '../common/local-storage';
-import { DiscoveryPulse } from '../common/pulse';
 import { registerCard, registerRemoveOverlay } from '../pm-plugins/actions';
-import InlineCardOverlay from '../ui/InlineCardOverlay';
-import { getResolvedAttributesFromStore } from '../utils';
-// editor adds a standard line-height that is bigger than an inline smart link
-// due to that the link has a bit of white space around it, which doesn't look right when there is pulse around it
-var loaderWrapperStyles = css({
-  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
-  '.loader-wrapper': {
-    lineHeight: 'normal'
-  }
-});
+import { AwarenessWrapper } from '../ui/AwarenessWrapper';
 var InlineCard = function InlineCard(_ref) {
-  var _cardContext$value2;
   var node = _ref.node,
     cardContext = _ref.cardContext,
     showServerActions = _ref.showServerActions,
@@ -36,8 +20,6 @@ var InlineCard = function InlineCard(_ref) {
   var _node$attrs = node.attrs,
     url = _node$attrs.url,
     data = _node$attrs.data;
-
-  // BEGIN: Awareness (To be revisited in EDM-8508)
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isHovered = _useState2[0],
@@ -50,33 +32,6 @@ var InlineCard = function InlineCard(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     isResolvedViewRendered = _useState6[0],
     setIsResolvedViewRendered = _useState6[1];
-  var linkPosition = useMemo(function () {
-    if (!getPos || typeof getPos === 'boolean') {
-      return undefined;
-    }
-    var pos = getPos();
-    return typeof pos === 'number' ? pos : undefined;
-  }, [getPos]);
-  var _useLinkUpgradeDiscov = useLinkUpgradeDiscoverability({
-      url: url,
-      linkPosition: linkPosition || -1,
-      cardContext: cardContext === null || cardContext === void 0 ? void 0 : cardContext.value,
-      pluginInjectionApi: pluginInjectionApi,
-      isOverlayEnabled: isOverlayEnabled,
-      isPulseEnabled: isPulseEnabled
-    }),
-    shouldShowLinkPulse = _useLinkUpgradeDiscov.shouldShowLinkPulse,
-    shouldShowToolbarPulse = _useLinkUpgradeDiscov.shouldShowToolbarPulse,
-    shouldShowLinkOverlay = _useLinkUpgradeDiscov.shouldShowLinkOverlay,
-    isLinkMostRecentlyInserted = _useLinkUpgradeDiscov.isLinkMostRecentlyInserted;
-
-  // If the toolbar pulse has not yet been invalidated and this is a case where we will be showing it,
-  // we need to invalidate the link pulse too. Toolbar pulse will be invalidated in the corresponding component.
-  if (isSelected && shouldShowToolbarPulse && !isLocalStorageKeyDiscovered(LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR)) {
-    markLocalStorageKeyDiscovered(LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK);
-  }
-  // END: Awareness
-
   var scrollContainer = useMemo(function () {
     return findOverflowScrollParent(view.dom) || undefined;
   }, [view.dom]);
@@ -108,8 +63,7 @@ var InlineCard = function InlineCard(_ref) {
     if (title) {
       setIsResolvedViewRendered(true);
     }
-    setIsInserted(isLinkMostRecentlyInserted);
-  }, [view, getPos, isLinkMostRecentlyInserted]);
+  }, [view, getPos]);
   var onError = useCallback(function (data) {
     var url = data.url,
       err = data.err;
@@ -120,8 +74,22 @@ var InlineCard = function InlineCard(_ref) {
       url: url
     });
   }, [onResolve]);
+
+  // Begin Upgrade Awareness related code
+  var markMostRecentlyInsertedLink = useCallback(function (isLinkMostRecentlyInserted) {
+    if (isOverlayEnabled) {
+      setIsInserted(isLinkMostRecentlyInserted);
+    }
+  }, [isOverlayEnabled]);
+  var setOverlayHoveredStyles = useCallback(function (isHovered) {
+    if (isOverlayEnabled) {
+      setIsHovered(isHovered);
+    }
+  }, [isOverlayEnabled]);
+  //  End Upgrade Awareness related code
+
   var innerCard = useMemo(function () {
-    return jsx(SmartCard, {
+    return /*#__PURE__*/React.createElement(SmartCard, {
       key: url,
       url: url,
       data: data,
@@ -135,41 +103,28 @@ var InlineCard = function InlineCard(_ref) {
       isHovered: isHovered
     });
   }, [data, isHovered, onError, onResolve, scrollContainer, showServerActions, url, useAlternativePreloader]);
-
-  // BEGIN: Awareness (To be revisited in EDM-8508)
-  var cardWithOverlay = useMemo(function () {
-    return shouldShowLinkOverlay ? jsx(InlineCardOverlay, {
-      isSelected: isSelected,
-      isVisible: isResolvedViewRendered && (isInserted || isHovered || isSelected),
-      onMouseEnter: function onMouseEnter() {
-        return setIsHovered(true);
-      },
-      onMouseLeave: function onMouseLeave() {
-        return setIsHovered(false);
-      },
-      url: url
-    }, innerCard) : innerCard;
-  }, [innerCard, isHovered, isResolvedViewRendered, isSelected, isInserted, shouldShowLinkOverlay, url]);
   var card = useMemo(function () {
-    var _cardContext$value;
-    return jsx("span", {
-      css: shouldShowLinkPulse && loaderWrapperStyles,
+    return isOverlayEnabled || isPulseEnabled ? /*#__PURE__*/React.createElement(AwarenessWrapper, {
+      isOverlayEnabled: isOverlayEnabled,
+      isPulseEnabled: isPulseEnabled,
+      cardContext: cardContext,
+      getPos: getPos,
+      isHovered: isHovered,
+      isInserted: isInserted,
+      url: url,
+      isSelected: isSelected,
+      isResolvedViewRendered: isResolvedViewRendered,
+      markMostRecentlyInsertedLink: markMostRecentlyInsertedLink,
+      pluginInjectionApi: pluginInjectionApi,
+      setOverlayHoveredStyles: setOverlayHoveredStyles
+    }, innerCard) : /*#__PURE__*/React.createElement("span", {
       className: "card"
-    }, shouldShowLinkPulse ? jsx(AnalyticsContext, {
-      data: {
-        attributes: getResolvedAttributesFromStore(url, 'inline', cardContext === null || cardContext === void 0 || (_cardContext$value = cardContext.value) === null || _cardContext$value === void 0 ? void 0 : _cardContext$value.store)
-      }
-    }, jsx(DiscoveryPulse, {
-      localStorageKey: LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK,
-      localStorageKeyExpirationInMs: ONE_DAY_IN_MILLISECONDS,
-      discoveryMode: "start"
-    }, cardWithOverlay)) : cardWithOverlay);
-  }, [shouldShowLinkPulse, cardWithOverlay, url, cardContext === null || cardContext === void 0 || (_cardContext$value2 = cardContext.value) === null || _cardContext$value2 === void 0 ? void 0 : _cardContext$value2.store]);
-  // END: Awareness
+    }, innerCard);
+  }, [cardContext, getPos, innerCard, isHovered, isInserted, isOverlayEnabled, isPulseEnabled, isResolvedViewRendered, isSelected, markMostRecentlyInsertedLink, pluginInjectionApi, setOverlayHoveredStyles, url]);
 
   // [WS-2307]: we only render card wrapped into a Provider when the value is ready,
   // otherwise if we got data, we can render the card directly since it doesn't need the Provider
-  return cardContext && cardContext.value ? jsx(cardContext.Provider, {
+  return cardContext && cardContext.value ? /*#__PURE__*/React.createElement(cardContext.Provider, {
     value: cardContext.value
   }, card) : data ? card : null;
 };

package/dist/esm/pm-plugins/main.js

@@ -48,6 +48,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
       allowEmbeds = options.allowEmbeds,
       allowBlockCards = options.allowBlockCards;
     var enableInlineUpgradeFeatures = !!showUpgradeDiscoverability && platform !== 'mobile';
+    var shouldUseUpgradeFeatures = getBooleanFF('platform.linking-platform.smart-card.inline-switcher') && enableInlineUpgradeFeatures;
     var inlineCardViewProducer = getInlineNodeViewProducer({
       pmPluginFactoryParams: pmPluginFactoryParams,
       Component: InlineCardNodeView,
@@ -91,7 +92,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
           if (!meta) {
             return pluginStateWithUpdatedPos;
           }
-          if (!getBooleanFF('platform.linking-platform.smart-card.inline-switcher')) {
+          if (!shouldUseUpgradeFeatures) {
             return reducer(pluginStateWithUpdatedPos, meta);
           }
           var newState = reducer(pluginStateWithUpdatedPos, meta);
@@ -99,7 +100,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
           // the code below is related to the "Inline Switcher" project, for more information pls see EDM-7984
           var isSingleInlineLink = (pluginState === null || pluginState === void 0 || (_pluginState$requests = pluginState.requests) === null || _pluginState$requests === void 0 ? void 0 : _pluginState$requests.length) === 1 && pluginState.requests[0].appearance === 'inline';
           var isSmartLinkPulseDiscovered = isLocalStorageKeyDiscovered(LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK);
-          if (meta.type !== 'RESOLVE' || !enableInlineUpgradeFeatures || !isSingleInlineLink) {
+          if (meta.type !== 'RESOLVE' || !isSingleInlineLink) {
             return newState;
           }
           var linkPosition = pluginState.requests[0].pos;
@@ -241,7 +242,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             return new EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
           }
         }
-      }, getBooleanFF('platform.linking-platform.smart-card.inline-switcher') && {
+      }, shouldUseUpgradeFeatures && {
         handleKeyDown: function handleKeyDown(view) {
           handleAwarenessOverlay(view);
           return false;