@atlaskit/editor-plugin-card 0.14.17 → 0.14.19

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-card
 
+## 0.14.19
+
+### Patch Changes
+
+- [#60660](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/60660) [`102ad9375609`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/102ad9375609) - Fixed an issue where link creationMethod attribute was set as unknown when inserting via datasource config modal.
+
+## 0.14.18
+
+### Patch Changes
+
+- [#60441](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/60441) [`13892b95e918`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/13892b95e918) - [ux] Refactoring of the inline card with awareness solution (behind a FF)
+
 ## 0.14.17
 
 ### Patch Changes

package/dist/cjs/nodeviews/inlineCard.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.InlineCardComponent = void 0;
 exports.InlineCardNodeView = InlineCardNodeView;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -123,7 +124,6 @@ var InlineCardComponent = exports.InlineCardComponent = /*#__PURE__*/function (_
 var WrappedInlineCard = (0, _genericCard.Card)(InlineCardComponent, _ui.UnsupportedInline);
 var WrappedInlineCardWithAwareness = (0, _genericCard.Card)(_inlineCardWithAwareness.InlineCardWithAwareness, _ui.UnsupportedInline);
 function InlineCardNodeView(props) {
-  var _view$state$selection, _view$state$selection2;
   var useAlternativePreloader = props.useAlternativePreloader,
     node = props.node,
     view = props.view,
@@ -142,26 +142,24 @@ 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 ? (0, _utils.isEmbedSupportedAtPosition)(linkPosition, editorState, 'inline') : false;
-  var canBeUpgradedToBlock = !!linkPosition && allowBlockCards ? (0, _utils.isBlockSupportedAtPosition)(linkPosition, editorState, 'inline') : false;
-  var isPulseEnabled = enableInlineUpgradeFeatures && canBeUpgradedToEmbed;
-  var isOverlayEnabled = enableInlineUpgradeFeatures && (canBeUpgradedToEmbed || canBeUpgradedToBlock);
-  var isSelected = view.state.selection instanceof _state.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.default.createElement(WrappedInlineCardWithAwareness, {
+  return /*#__PURE__*/_react.default.createElement(WrappedInlineCardWithAwareness, (0, _extends2.default)({
     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 ? (0, _utils.isEmbedSupportedAtPosition)(linkPosition, editorState, 'inline') : false;
+  var canBeUpgradedToBlock = !!linkPosition && allowBlockCards ? (0, _utils.isBlockSupportedAtPosition)(linkPosition, editorState, 'inline') : false;
+  var isSelected = editorState.selection instanceof _state.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/cjs/nodeviews/inlineCardWithAwareness.js

@@ -1,35 +1,21 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InlineCardWithAwareness = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = require("react");
-var _react2 = require("@emotion/react");
+var _react = _interopRequireWildcard(require("react"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
-var _analyticsNext = require("@atlaskit/analytics-next");
 var _ui = require("@atlaskit/editor-common/ui");
 var _smartCard = require("@atlaskit/smart-card");
-var _useLinkUpgradeDiscoverability = _interopRequireDefault(require("../common/hooks/useLinkUpgradeDiscoverability"));
-var _localStorage = require("../common/local-storage");
-var _pulse = require("../common/pulse");
 var _actions = require("../pm-plugins/actions");
-var _InlineCardOverlay = _interopRequireDefault(require("../ui/InlineCardOverlay"));
-var _utils = require("../utils");
-/** @jsx jsx */
-
-// 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 = (0, _react2.css)({
-  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
-  '.loader-wrapper': {
-    lineHeight: 'normal'
-  }
-});
+var _AwarenessWrapper = require("../ui/AwarenessWrapper");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var InlineCard = function InlineCard(_ref) {
-  var _cardContext$value2;
   var node = _ref.node,
     cardContext = _ref.cardContext,
     showServerActions = _ref.showServerActions,
@@ -44,8 +30,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 = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isHovered = _useState2[0],
@@ -58,33 +42,6 @@ var InlineCard = function InlineCard(_ref) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     isResolvedViewRendered = _useState6[0],
     setIsResolvedViewRendered = _useState6[1];
-  var linkPosition = (0, _react.useMemo)(function () {
-    if (!getPos || typeof getPos === 'boolean') {
-      return undefined;
-    }
-    var pos = getPos();
-    return typeof pos === 'number' ? pos : undefined;
-  }, [getPos]);
-  var _useLinkUpgradeDiscov = (0, _useLinkUpgradeDiscoverability.default)({
-      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 && !(0, _localStorage.isLocalStorageKeyDiscovered)(_localStorage.LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR)) {
-    (0, _localStorage.markLocalStorageKeyDiscovered)(_localStorage.LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK);
-  }
-  // END: Awareness
-
   var scrollContainer = (0, _react.useMemo)(function () {
     return (0, _ui.findOverflowScrollParent)(view.dom) || undefined;
   }, [view.dom]);
@@ -116,8 +73,7 @@ var InlineCard = function InlineCard(_ref) {
     if (title) {
       setIsResolvedViewRendered(true);
     }
-    setIsInserted(isLinkMostRecentlyInserted);
-  }, [view, getPos, isLinkMostRecentlyInserted]);
+  }, [view, getPos]);
   var onError = (0, _react.useCallback)(function (data) {
     var url = data.url,
       err = data.err;
@@ -128,8 +84,22 @@ var InlineCard = function InlineCard(_ref) {
       url: url
     });
   }, [onResolve]);
+
+  // Begin Upgrade Awareness related code
+  var markMostRecentlyInsertedLink = (0, _react.useCallback)(function (isLinkMostRecentlyInserted) {
+    if (isOverlayEnabled) {
+      setIsInserted(isLinkMostRecentlyInserted);
+    }
+  }, [isOverlayEnabled]);
+  var setOverlayHoveredStyles = (0, _react.useCallback)(function (isHovered) {
+    if (isOverlayEnabled) {
+      setIsHovered(isHovered);
+    }
+  }, [isOverlayEnabled]);
+  //  End Upgrade Awareness related code
+
   var innerCard = (0, _react.useMemo)(function () {
-    return (0, _react2.jsx)(_smartCard.Card, {
+    return /*#__PURE__*/_react.default.createElement(_smartCard.Card, {
       key: url,
       url: url,
       data: data,
@@ -143,41 +113,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 = (0, _react.useMemo)(function () {
-    return shouldShowLinkOverlay ? (0, _react2.jsx)(_InlineCardOverlay.default, {
-      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 = (0, _react.useMemo)(function () {
-    var _cardContext$value;
-    return (0, _react2.jsx)("span", {
-      css: shouldShowLinkPulse && loaderWrapperStyles,
+    return isOverlayEnabled || isPulseEnabled ? /*#__PURE__*/_react.default.createElement(_AwarenessWrapper.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.default.createElement("span", {
       className: "card"
-    }, shouldShowLinkPulse ? (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
-      data: {
-        attributes: (0, _utils.getResolvedAttributesFromStore)(url, 'inline', cardContext === null || cardContext === void 0 || (_cardContext$value = cardContext.value) === null || _cardContext$value === void 0 ? void 0 : _cardContext$value.store)
-      }
-    }, (0, _react2.jsx)(_pulse.DiscoveryPulse, {
-      localStorageKey: _localStorage.LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK,
-      localStorageKeyExpirationInMs: _localStorage.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 ? (0, _react2.jsx)(cardContext.Provider, {
+  return cardContext && cardContext.value ? /*#__PURE__*/_react.default.createElement(cardContext.Provider, {
     value: cardContext.value
   }, card) : data ? card : null;
 };

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

@@ -60,6 +60,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
       allowEmbeds = options.allowEmbeds,
       allowBlockCards = options.allowBlockCards;
     var enableInlineUpgradeFeatures = !!showUpgradeDiscoverability && platform !== 'mobile';
+    var shouldUseUpgradeFeatures = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.inline-switcher') && enableInlineUpgradeFeatures;
     var inlineCardViewProducer = (0, _reactNodeView.getInlineNodeViewProducer)({
       pmPluginFactoryParams: pmPluginFactoryParams,
       Component: _inlineCard.InlineCardNodeView,
@@ -103,7 +104,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
           if (!meta) {
             return pluginStateWithUpdatedPos;
           }
-          if (!(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.inline-switcher')) {
+          if (!shouldUseUpgradeFeatures) {
             return (0, _reducers.default)(pluginStateWithUpdatedPos, meta);
           }
           var newState = (0, _reducers.default)(pluginStateWithUpdatedPos, meta);
@@ -111,7 +112,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
           // 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 = (0, _localStorage.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;
@@ -253,7 +254,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
             return new _embedCard.EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
           }
         }
-      }, (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.inline-switcher') && {
+      }, shouldUseUpgradeFeatures && {
         handleKeyDown: function handleKeyDown(view) {
           handleAwarenessOverlay(view);
           return false;

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

@@ -0,0 +1,107 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AwarenessWrapper = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _react2 = require("@emotion/react");
+var _analyticsNext = require("@atlaskit/analytics-next");
+var _useLinkUpgradeDiscoverability = _interopRequireDefault(require("../../common/hooks/useLinkUpgradeDiscoverability"));
+var _localStorage = require("../../common/local-storage");
+var _utils = require("../../utils");
+var _InlineCardOverlay = _interopRequireDefault(require("../InlineCardOverlay"));
+var _Pulse = require("../Pulse");
+/** @jsx jsx */
+
+// 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 = (0, _react2.css)({
+  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
+  '.loader-wrapper': {
+    lineHeight: 'normal'
+  }
+});
+var AwarenessWrapper = exports.AwarenessWrapper = function AwarenessWrapper(_ref) {
+  var _cardContext$value2;
+  var cardContext = _ref.cardContext,
+    children = _ref.children,
+    getPos = _ref.getPos,
+    isInserted = _ref.isInserted,
+    isOverlayEnabled = _ref.isOverlayEnabled,
+    isSelected = _ref.isSelected,
+    isResolvedViewRendered = _ref.isResolvedViewRendered,
+    isPulseEnabled = _ref.isPulseEnabled,
+    markMostRecentlyInsertedLink = _ref.markMostRecentlyInsertedLink,
+    pluginInjectionApi = _ref.pluginInjectionApi,
+    setOverlayHoveredStyles = _ref.setOverlayHoveredStyles,
+    url = _ref.url;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    isHovered = _useState2[0],
+    setIsHovered = _useState2[1];
+  var linkPosition = (0, _react.useMemo)(function () {
+    if (!getPos || typeof getPos === 'boolean') {
+      return undefined;
+    }
+    var pos = getPos();
+    return typeof pos === 'number' ? pos : undefined;
+  }, [getPos]);
+  var _useLinkUpgradeDiscov = (0, _useLinkUpgradeDiscoverability.default)({
+      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 && !(0, _localStorage.isLocalStorageKeyDiscovered)(_localStorage.LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR)) {
+    (0, _localStorage.markLocalStorageKeyDiscovered)(_localStorage.LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK);
+  }
+  (0, _react.useEffect)(function () {
+    if (shouldShowLinkOverlay && isLinkMostRecentlyInserted) {
+      markMostRecentlyInsertedLink(true);
+    }
+  }, [isLinkMostRecentlyInserted, markMostRecentlyInsertedLink, shouldShowLinkOverlay]);
+  var handleOverlayChange = (0, _react.useCallback)(function (isHovered) {
+    setIsHovered(isHovered);
+    setOverlayHoveredStyles(isHovered);
+  }, [setOverlayHoveredStyles]);
+  var cardWithOverlay = (0, _react.useMemo)(function () {
+    return shouldShowLinkOverlay ? (0, _react2.jsx)(_InlineCardOverlay.default, {
+      isSelected: isSelected,
+      isVisible: isResolvedViewRendered && (isInserted || isHovered || isSelected),
+      onMouseEnter: function onMouseEnter() {
+        return handleOverlayChange(true);
+      },
+      onMouseLeave: function onMouseLeave() {
+        return handleOverlayChange(false);
+      },
+      url: url
+    }, children) : children;
+  }, [shouldShowLinkOverlay, isSelected, isResolvedViewRendered, isInserted, isHovered, url, children, handleOverlayChange]);
+  return (0, _react.useMemo)(function () {
+    var _cardContext$value;
+    return (0, _react2.jsx)("span", {
+      css: shouldShowLinkPulse && loaderWrapperStyles,
+      className: "card"
+    }, shouldShowLinkPulse ? (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
+      data: {
+        attributes: (0, _utils.getResolvedAttributesFromStore)(url, 'inline', cardContext === null || cardContext === void 0 || (_cardContext$value = cardContext.value) === null || _cardContext$value === void 0 ? void 0 : _cardContext$value.store)
+      }
+    }, (0, _react2.jsx)(_Pulse.DiscoveryPulse, {
+      localStorageKey: _localStorage.LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK,
+      localStorageKeyExpirationInMs: _localStorage.ONE_DAY_IN_MILLISECONDS,
+      discoveryMode: "start"
+    }, cardWithOverlay)) : cardWithOverlay);
+  }, [shouldShowLinkPulse, url, cardContext === null || cardContext === void 0 || (_cardContext$value2 = cardContext.value) === null || _cardContext$value2 === void 0 ? void 0 : _cardContext$value2.store, cardWithOverlay]);
+};

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

@@ -25,7 +25,10 @@ var withHistoryMethod = function withHistoryMethod(fn) {
   };
 };
 var getMethod = exports.getMethod = withHistoryMethod(function (_ref) {
-  var inputMethod = _ref.inputMethod;
+  var _inputMethod, _payload;
+  var inputMethod = _ref.inputMethod,
+    sourceEvent = _ref.sourceEvent;
+  inputMethod = (_inputMethod = inputMethod) !== null && _inputMethod !== void 0 ? _inputMethod : sourceEvent === null || sourceEvent === void 0 || (_payload = sourceEvent.payload) === null || _payload === void 0 || (_payload = _payload.attributes) === null || _payload === void 0 ? void 0 : _payload.inputMethod;
   switch (inputMethod) {
     case _analytics.INPUT_METHOD.CLIPBOARD:
       return 'editor_paste';
@@ -38,6 +41,8 @@ var getMethod = exports.getMethod = withHistoryMethod(function (_ref) {
       return 'linkpicker_searchResult';
     case _analytics.INPUT_METHOD.MANUAL:
       return 'linkpicker_manual';
+    case _analytics.INPUT_METHOD.DATASOURCE:
+      return 'datasource_config';
     default:
       return 'unknown';
   }

package/dist/cjs/ui/LinkToolbarAppearance.js

@@ -22,9 +22,9 @@ var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/message
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _localStorage = require("../common/local-storage");
-var _pulse = require("../common/pulse");
 var _toolbar = require("../toolbar");
 var _utils2 = require("../utils");
+var _Pulse = require("./Pulse");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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; }
@@ -134,7 +134,7 @@ var LinkToolbarAppearance = exports.LinkToolbarAppearance = /*#__PURE__*/functio
           data: {
             attributes: _objectSpread({}, resolvedAnalyticsAttributes)
           }
-        }, /*#__PURE__*/_react.default.createElement(_pulse.DiscoveryPulse, {
+        }, /*#__PURE__*/_react.default.createElement(_Pulse.DiscoveryPulse, {
           localStorageKey: _localStorage.LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR
         }, LinkToolbarButtons));
       }

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

@@ -8,7 +8,7 @@ exports.DiscoveryPulse = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _linkingCommon = require("@atlaskit/linking-common");
-var _localStorage = require("../local-storage");
+var _localStorage = require("../../common/local-storage");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var DiscoveryPulse = exports.DiscoveryPulse = function DiscoveryPulse(_ref) {

package/dist/es2019/nodeviews/inlineCard.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import PropTypes from 'prop-types';
@@ -103,7 +104,6 @@ _defineProperty(InlineCardComponent, "contextTypes", {
 const WrappedInlineCard = Card(InlineCardComponent, UnsupportedInline);
 const WrappedInlineCardWithAwareness = Card(InlineCardWithAwareness, UnsupportedInline);
 export function InlineCardNodeView(props) {
-  var _view$state$selection, _view$state$selection2, _view$state$selection3;
   const {
     useAlternativePreloader,
     node,
@@ -124,26 +124,24 @@ export function InlineCardNodeView(props) {
       useAlternativePreloader: useAlternativePreloader
     });
   }
-
-  // BEGIN: Awareness (To be revisited in EDM-8508)
-  const editorState = view.state;
-  const linkPosition = getPos && typeof getPos() === 'number' ? getPos() : undefined;
-  const canBeUpgradedToEmbed = !!linkPosition && allowEmbeds ? isEmbedSupportedAtPosition(linkPosition, editorState, 'inline') : false;
-  const canBeUpgradedToBlock = !!linkPosition && allowBlockCards ? isBlockSupportedAtPosition(linkPosition, editorState, 'inline') : false;
-  const isPulseEnabled = enableInlineUpgradeFeatures && canBeUpgradedToEmbed;
-  const isOverlayEnabled = enableInlineUpgradeFeatures && (canBeUpgradedToEmbed || canBeUpgradedToBlock);
-  const isSelected = view.state.selection instanceof NodeSelection && ((_view$state$selection = view.state.selection) === null || _view$state$selection === void 0 ? void 0 : (_view$state$selection2 = _view$state$selection.node) === null || _view$state$selection2 === void 0 ? void 0 : _view$state$selection2.type) === view.state.schema.nodes.inlineCard && ((_view$state$selection3 = view.state.selection) === null || _view$state$selection3 === void 0 ? void 0 : _view$state$selection3.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,
-    isSelected: isSelected
-  });
-}
+    pluginInjectionApi: pluginInjectionApi
+  }, enableInlineUpgradeFeatures && getAwarenessProps(view.state, getPos, allowEmbeds, allowBlockCards)));
+}
+const getAwarenessProps = (editorState, getPos, allowEmbeds, allowBlockCards) => {
+  var _editorState$selectio, _editorState$selectio2, _editorState$selectio3;
+  const linkPosition = getPos && typeof getPos() === 'number' ? getPos() : undefined;
+  const canBeUpgradedToEmbed = !!linkPosition && allowEmbeds ? isEmbedSupportedAtPosition(linkPosition, editorState, 'inline') : false;
+  const canBeUpgradedToBlock = !!linkPosition && allowBlockCards ? isBlockSupportedAtPosition(linkPosition, editorState, 'inline') : false;
+  const isSelected = editorState.selection instanceof NodeSelection && ((_editorState$selectio = editorState.selection) === null || _editorState$selectio === void 0 ? void 0 : (_editorState$selectio2 = _editorState$selectio.node) === null || _editorState$selectio2 === void 0 ? void 0 : _editorState$selectio2.type) === editorState.schema.nodes.inlineCard && ((_editorState$selectio3 = editorState.selection) === null || _editorState$selectio3 === void 0 ? void 0 : _editorState$selectio3.from) === getPos();
+  return {
+    isPulseEnabled: canBeUpgradedToEmbed,
+    isOverlayEnabled: canBeUpgradedToEmbed || canBeUpgradedToBlock,
+    isSelected
+  };
+};