@atlaskit/editor-plugin-card 2.3.3 → 2.3.5

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-card
 
+## 2.3.5
+
+### Patch Changes
+
+- [#117005](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117005)
+  [`74f438b3abcff`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/74f438b3abcff) -
+  [ux] Fix for import statement in plugins.tsx
+- Updated dependencies
+
+## 2.3.4
+
+### Patch Changes
+
+- [#116819](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116819)
+  [`d80c008d6a32e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d80c008d6a32e) -
+  [ux] Seperate live page overlay logic from discoverability overlay and assosciated code refactor
+
 ## 2.3.3
 
 ### Patch Changes

package/dist/cjs/nodeviews/genericCard.js

@@ -107,7 +107,7 @@ function Card(SmartCardComponent, UnsupportedComponent) {
             // Below is added for the future implementation of Linking Platform namespaced analytics context
             location: analyticsEditorAppearance
           }
-        }, (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.on-click-callback') ? /*#__PURE__*/_react.default.createElement(WithClickHandler, {
+        }, (0, _platformFeatureFlags.fg)('platform.linking-platform.smart-card.on-click-callback') ? /*#__PURE__*/_react.default.createElement(WithClickHandler, {
           pluginInjectionApi: pluginInjectionApi,
           onClickCallback: onClickCallback,
           url: url

package/dist/cjs/nodeviews/inlineCard.js

@@ -1,18 +1,101 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.InlineCard = void 0;
 exports.InlineCardNodeView = InlineCardNodeView;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _ui = require("@atlaskit/editor-common/ui");
-var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _smartCard = require("@atlaskit/smart-card");
+var _actions = require("../pm-plugins/actions");
+var _ConfigureOverlay = _interopRequireDefault(require("../ui/ConfigureOverlay"));
 var _utils = require("../utils");
 var _genericCard = require("./genericCard");
 var _inlineCardWithAwareness = require("./inlineCardWithAwareness");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_ref) {
+  var node = _ref.node,
+    cardContext = _ref.cardContext,
+    actionOptions = _ref.actionOptions,
+    showServerActions = _ref.showServerActions,
+    useAlternativePreloader = _ref.useAlternativePreloader,
+    view = _ref.view,
+    getPos = _ref.getPos,
+    onClick = _ref.onClick,
+    onRes = _ref.onResolve,
+    isHovered = _ref.isHovered;
+  var _node$attrs = node.attrs,
+    url = _node$attrs.url,
+    data = _node$attrs.data;
+  var scrollContainer = (0, _react.useMemo)(function () {
+    return (0, _ui.findOverflowScrollParent)(view.dom) || undefined;
+  }, [view.dom]);
+  var onResolve = (0, _react.useCallback)(function (data) {
+    if (!getPos || typeof getPos === 'boolean') {
+      return;
+    }
+    var title = data.title,
+      url = data.url;
+    // don't dispatch immediately since we might be in the middle of
+    // rendering a nodeview
+    (0, _rafSchd.default)(function () {
+      // prosemirror-bump-fix
+      var pos = getPos();
+      if (typeof pos !== 'number') {
+        return;
+      }
+      var tr = view.state.tr;
+      (0, _actions.registerCard)({
+        title: title,
+        url: url,
+        pos: pos
+      })(tr);
+      onRes === null || onRes === void 0 || onRes(tr, title);
+      view.dispatch(tr);
+    })();
+  }, [getPos, view, onRes]);
+  var onError = (0, _react.useCallback)(function (data) {
+    var url = data.url,
+      err = data.err;
+    if (err) {
+      throw err;
+    }
+    onResolve({
+      url: url
+    });
+  }, [onResolve]);
+  var card = (0, _react.useMemo)(function () {
+    return /*#__PURE__*/_react.default.createElement(_smartCard.Card, {
+      key: url,
+      url: url,
+      data: data,
+      appearance: "inline",
+      onClick: onClick,
+      container: scrollContainer,
+      onResolve: onResolve,
+      onError: onError,
+      inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
+      actionOptions: actionOptions,
+      showServerActions: showServerActions,
+      isHovered: isHovered
+    });
+  }, [data, isHovered, onError, onResolve, scrollContainer, url, useAlternativePreloader, actionOptions, showServerActions, onClick]);
+
+  // [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 ? /*#__PURE__*/_react.default.createElement(cardContext.Provider, {
+    value: cardContext.value
+  }, card) : data ? card : null;
+});
 var WrappedInlineCardWithAwareness = (0, _genericCard.Card)(_inlineCardWithAwareness.InlineCardWithAwareness, _ui.UnsupportedInline);
+var WrappedInlineCard = (0, _genericCard.Card)(InlineCard, _ui.UnsupportedInline);
 function InlineCardNodeView(props) {
   var useAlternativePreloader = props.useAlternativePreloader,
     node = props.node,
@@ -25,6 +108,20 @@ function InlineCardNodeView(props) {
     enableInlineUpgradeFeatures = props.enableInlineUpgradeFeatures,
     pluginInjectionApi = props.pluginInjectionApi,
     onClickCallback = props.onClickCallback;
+  if ((0, _platformFeatureFlags.fg)('platform.linking-platform.smart-links-in-live-pages')) {
+    return /*#__PURE__*/_react.default.createElement(_ConfigureOverlay.default, {
+      targetElementPos: getPos(),
+      view: view
+    }, /*#__PURE__*/_react.default.createElement(WrappedInlineCard, {
+      node: node,
+      view: view,
+      getPos: getPos,
+      actionOptions: actionOptions,
+      showServerActions: showServerActions,
+      useAlternativePreloader: useAlternativePreloader,
+      onClickCallback: onClickCallback
+    }));
+  }
   return /*#__PURE__*/_react.default.createElement(WrappedInlineCardWithAwareness, (0, _extends2.default)({
     node: node,
     view: view,
@@ -34,17 +131,5 @@ function InlineCardNodeView(props) {
     useAlternativePreloader: useAlternativePreloader,
     pluginInjectionApi: pluginInjectionApi,
     onClickCallback: onClickCallback
-  }, 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
-  };
-};
+  }, enableInlineUpgradeFeatures && (0, _utils.getAwarenessProps)(view.state, getPos, allowEmbeds, allowBlockCards)));
+}

package/dist/cjs/nodeviews/inlineCardWithAwareness.js

@@ -8,14 +8,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.InlineCardWithAwareness = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _rafSchd = _interopRequireDefault(require("raf-schd"));
-var _ui = require("@atlaskit/editor-common/ui");
-var _smartCard = require("@atlaskit/smart-card");
 var _actions = require("../pm-plugins/actions");
 var _AwarenessWrapper = require("../ui/AwarenessWrapper");
+var _inlineCard = require("./inlineCard");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var InlineCard = function InlineCard(_ref) {
+var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var node = _ref.node,
     cardContext = _ref.cardContext,
     actionOptions = _ref.actionOptions,
@@ -23,15 +21,11 @@ var InlineCard = function InlineCard(_ref) {
     useAlternativePreloader = _ref.useAlternativePreloader,
     view = _ref.view,
     getPos = _ref.getPos,
-    isOverlayEnabled = _ref.isOverlayEnabled,
-    isPulseEnabled = _ref.isPulseEnabled,
     pluginInjectionApi = _ref.pluginInjectionApi,
-    _ref$isSelected = _ref.isSelected,
-    isSelected = _ref$isSelected === void 0 ? false : _ref$isSelected,
-    onClick = _ref.onClick;
-  var _node$attrs = node.attrs,
-    url = _node$attrs.url,
-    data = _node$attrs.data;
+    onClick = _ref.onClick,
+    isPulseEnabled = _ref.isPulseEnabled,
+    isOverlayEnabled = _ref.isOverlayEnabled,
+    isSelected = _ref.isSelected;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isHovered = _useState2[0],
@@ -44,50 +38,14 @@ var InlineCard = function InlineCard(_ref) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     isResolvedViewRendered = _useState6[0],
     setIsResolvedViewRendered = _useState6[1];
-  var scrollContainer = (0, _react.useMemo)(function () {
-    return (0, _ui.findOverflowScrollParent)(view.dom) || undefined;
-  }, [view.dom]);
-  var onResolve = (0, _react.useCallback)(function (data) {
-    if (!getPos || typeof getPos === 'boolean') {
-      return;
-    }
-    var title = data.title,
-      url = data.url;
-    // don't dispatch immediately since we might be in the middle of
-    // rendering a nodeview
-    (0, _rafSchd.default)(function () {
-      // prosemirror-bump-fix
-      var pos = getPos();
-      if (typeof pos !== 'number') {
-        return;
-      }
-      var tr = view.state.tr;
-      (0, _actions.registerCard)({
-        title: title,
-        url: url,
-        pos: pos
-      })(tr);
-      (0, _actions.registerRemoveOverlay)(function () {
-        return setIsInserted(false);
-      })(tr);
-      view.dispatch(tr);
-    })();
+  var onResolve = (0, _react.useCallback)(function (tr, title) {
+    (0, _actions.registerRemoveOverlay)(function () {
+      return setIsInserted(false);
+    })(tr);
     if (title) {
       setIsResolvedViewRendered(true);
     }
-  }, [view, getPos]);
-  var onError = (0, _react.useCallback)(function (data) {
-    var url = data.url,
-      err = data.err;
-    if (err) {
-      throw err;
-    }
-    onResolve({
-      url: url
-    });
-  }, [onResolve]);
-
-  // Begin Upgrade Awareness related code
+  }, []);
   var markMostRecentlyInsertedLink = (0, _react.useCallback)(function (isLinkMostRecentlyInserted) {
     if (isOverlayEnabled) {
       setIsInserted(isLinkMostRecentlyInserted);
@@ -98,51 +56,37 @@ var InlineCard = function InlineCard(_ref) {
       setIsHovered(isHovered);
     }
   }, [isOverlayEnabled]);
-  //  End Upgrade Awareness related code
-
   var innerCard = (0, _react.useMemo)(function () {
-    return /*#__PURE__*/_react.default.createElement(_smartCard.Card, {
-      key: url,
-      url: url,
-      data: data,
-      appearance: "inline",
-      onClick: onClick,
-      container: scrollContainer,
-      onResolve: onResolve,
-      onError: onError,
-      inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
+    return /*#__PURE__*/_react.default.createElement(_inlineCard.InlineCard, {
+      node: node,
+      view: view,
+      getPos: getPos,
+      useAlternativePreloader: useAlternativePreloader,
       actionOptions: actionOptions,
       showServerActions: showServerActions,
+      onResolve: onResolve,
+      onClick: onClick,
+      cardContext: cardContext,
       isHovered: isHovered
     });
-  }, [data, isHovered, onError, onResolve, scrollContainer, url, useAlternativePreloader, actionOptions, showServerActions, onClick]);
-  var card = (0, _react.useMemo)(function () {
-    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,
-      view: view
-    }, innerCard) :
-    /*#__PURE__*/
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    _react.default.createElement("span", {
-      className: "card"
-    }, innerCard);
-  }, [cardContext, getPos, innerCard, isHovered, isInserted, isOverlayEnabled, isPulseEnabled, isResolvedViewRendered, isSelected, markMostRecentlyInsertedLink, pluginInjectionApi, setOverlayHoveredStyles, url, view]);
-
-  // [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 ? /*#__PURE__*/_react.default.createElement(cardContext.Provider, {
-    value: cardContext.value
-  }, card) : data ? card : null;
-};
-var InlineCardWithAwareness = exports.InlineCardWithAwareness = /*#__PURE__*/(0, _react.memo)(InlineCard);
+  }, [actionOptions, cardContext, getPos, isHovered, node, onClick, onResolve, showServerActions, useAlternativePreloader, view]);
+  return isOverlayEnabled || isPulseEnabled ? /*#__PURE__*/_react.default.createElement(_AwarenessWrapper.AwarenessWrapper, {
+    isOverlayEnabled: isOverlayEnabled,
+    isPulseEnabled: isPulseEnabled,
+    cardContext: cardContext,
+    getPos: getPos,
+    isHovered: isHovered,
+    isInserted: isInserted,
+    url: node.attrs.url,
+    isSelected: isSelected,
+    isResolvedViewRendered: isResolvedViewRendered,
+    markMostRecentlyInsertedLink: markMostRecentlyInsertedLink,
+    pluginInjectionApi: pluginInjectionApi,
+    setOverlayHoveredStyles: setOverlayHoveredStyles
+  }, innerCard) :
+  /*#__PURE__*/
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+  _react.default.createElement("span", {
+    className: "card"
+  }, innerCard);
+});

package/dist/cjs/plugin.js

@@ -13,9 +13,9 @@ var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _utils = require("@atlaskit/editor-common/utils");
 var _linkDatasource = require("@atlaskit/link-datasource");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _doc = require("../src/pm-plugins/doc");
 var _createEventsQueue = require("./analytics/create-events-queue");
 var _actions = require("./pm-plugins/actions");
+var _doc = require("./pm-plugins/doc");
 var _keymap = require("./pm-plugins/keymap");
 var _main = require("./pm-plugins/main");
 var _pluginKey = require("./pm-plugins/plugin-key");
@@ -142,7 +142,7 @@ var cardPlugin = exports.cardPlugin = function cardPlugin(_ref) {
         if ((0, _utils.canRenderDatasource)(_linkDatasource.ASSETS_LIST_OF_LINKS_DATASOURCE_ID)) {
           quickInsertArray.push({
             id: 'datasource',
-            title: (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_objects_remove_beta') ? formatMessage(_messages.cardMessages.datasourceAssetsObjectsGeneralAvailability) : formatMessage(_messages.cardMessages.datasourceAssetsObjects),
+            title: (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_objects_remove_beta') ? formatMessage(_messages.cardMessages.datasourceAssetsObjectsGeneralAvailability) : formatMessage(_messages.cardMessages.datasourceAssetsObjects),
             description: formatMessage(_messages.cardMessages.datasourceAssetsObjectsDescription),
             categories: ['external-content', 'development'],
             keywords: ['assets'],

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

@@ -9,11 +9,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _analyticsNext = require("@atlaskit/analytics-next");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _useLinkUpgradeDiscoverability = _interopRequireDefault(require("../../common/hooks/useLinkUpgradeDiscoverability"));
 var _localStorage = require("../../common/local-storage");
 var _utils = require("../../utils");
-var _ConfigureOverlay = _interopRequireDefault(require("../ConfigureOverlay"));
 var _InlineCardOverlay = _interopRequireDefault(require("../InlineCardOverlay"));
 var _Pulse = require("../Pulse");
 /** @jsx jsx */
@@ -41,8 +39,7 @@ var AwarenessWrapper = exports.AwarenessWrapper = function AwarenessWrapper(_ref
     markMostRecentlyInsertedLink = _ref.markMostRecentlyInsertedLink,
     pluginInjectionApi = _ref.pluginInjectionApi,
     setOverlayHoveredStyles = _ref.setOverlayHoveredStyles,
-    url = _ref.url,
-    view = _ref.view;
+    url = _ref.url;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isHovered = _useState2[0],
@@ -82,12 +79,6 @@ var AwarenessWrapper = exports.AwarenessWrapper = function AwarenessWrapper(_ref
     setOverlayHoveredStyles(isHovered);
   }, [setOverlayHoveredStyles]);
   var cardWithOverlay = (0, _react.useMemo)(function () {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-links-in-live-pages')) {
-      return (0, _react2.jsx)(_ConfigureOverlay.default, {
-        targetElementPos: linkPosition,
-        view: view
-      }, children);
-    }
     if (shouldShowLinkOverlay) {
       return (0, _react2.jsx)(_InlineCardOverlay.default, {
         isSelected: isSelected,
@@ -102,7 +93,7 @@ var AwarenessWrapper = exports.AwarenessWrapper = function AwarenessWrapper(_ref
       }, children);
     }
     return children;
-  }, [shouldShowLinkOverlay, children, isSelected, isResolvedViewRendered, isInserted, isHovered, url, view, linkPosition, handleOverlayChange]);
+  }, [shouldShowLinkOverlay, children, isSelected, isResolvedViewRendered, isInserted, isHovered, url, handleOverlayChange]);
   return (0, _react.useMemo)(function () {
     var _cardContext$value;
     return (

package/dist/cjs/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.titleUrlPairFromNode = exports.selectedCardAppearance = exports.mergeCardInfo = exports.isEmbedSupportedAtPosition = exports.isDatasourceNode = exports.isDatasourceConfigEditable = exports.isDatasourceAdfAttributes = exports.isBlockSupportedAtPosition = exports.getResolvedAttributesFromStore = exports.focusEditorView = exports.findCardInfo = exports.displayInfoForCard = exports.appearanceForNodeType = void 0;
+exports.titleUrlPairFromNode = exports.selectedCardAppearance = exports.mergeCardInfo = exports.isEmbedSupportedAtPosition = exports.isDatasourceNode = exports.isDatasourceConfigEditable = exports.isDatasourceAdfAttributes = exports.isBlockSupportedAtPosition = exports.getResolvedAttributesFromStore = exports.getAwarenessProps = exports.focusEditorView = exports.findCardInfo = exports.displayInfoForCard = exports.appearanceForNodeType = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -82,7 +82,7 @@ var getResolvedAttributesFromStore = exports.getResolvedAttributesFromStore = fu
 };
 var isDatasourceConfigEditable = exports.isDatasourceConfigEditable = function isDatasourceConfigEditable(datasourceId) {
   var datasourcesWithConfigModal = [_linkDatasource.JIRA_LIST_OF_LINKS_DATASOURCE_ID, _linkDatasource.ASSETS_LIST_OF_LINKS_DATASOURCE_ID];
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.enable-confluence-search-modal')) {
+  if ((0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.enable-confluence-search-modal')) {
     datasourcesWithConfigModal.push(_linkDatasource.CONFLUENCE_SEARCH_DATASOURCE_ID);
   }
   return datasourcesWithConfigModal.includes(datasourceId);
@@ -132,4 +132,17 @@ var focusEditorView = exports.focusEditorView = function focusEditorView(editorV
   if (!editorView.hasFocus()) {
     editorView.focus();
   }
+};
+var getAwarenessProps = exports.getAwarenessProps = function getAwarenessProps(editorState, getPos, allowEmbeds, allowBlockCards) {
+  var _editorState$selectio, _editorState$selectio2;
+  var getPosFunction = typeof getPos !== 'boolean' ? getPos : undefined;
+  var linkPosition = getPosFunction === null || getPosFunction === void 0 ? void 0 : getPosFunction();
+  var canBeUpgradedToEmbed = !!linkPosition && allowEmbeds ? isEmbedSupportedAtPosition(linkPosition, editorState, 'inline') : false;
+  var canBeUpgradedToBlock = !!linkPosition && allowBlockCards ? 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) === (getPosFunction === null || getPosFunction === void 0 ? void 0 : getPosFunction());
+  return {
+    isPulseEnabled: canBeUpgradedToEmbed,
+    isOverlayEnabled: canBeUpgradedToEmbed || canBeUpgradedToBlock,
+    isSelected: isSelected
+  };
 };

package/dist/es2019/nodeviews/genericCard.js

@@ -6,7 +6,7 @@ import { isSafeUrl } from '@atlaskit/adf-schema';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { getAnalyticsEditorAppearance } from '@atlaskit/editor-common/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { changeSelectedCardToLinkFallback } from '../pm-plugins/doc';
 import { getPluginState } from '../pm-plugins/util/state';
 import { titleUrlPairFromNode } from '../utils';
@@ -82,7 +82,7 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
           // Below is added for the future implementation of Linking Platform namespaced analytics context
           location: analyticsEditorAppearance
         }
-      }, getBooleanFF('platform.linking-platform.smart-card.on-click-callback') ? /*#__PURE__*/React.createElement(WithClickHandler, {
+      }, fg('platform.linking-platform.smart-card.on-click-callback') ? /*#__PURE__*/React.createElement(WithClickHandler, {
         pluginInjectionApi: pluginInjectionApi,
         onClickCallback: onClickCallback,
         url: url

package/dist/es2019/nodeviews/inlineCard.js

@@ -1,11 +1,92 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
-import { UnsupportedInline } from '@atlaskit/editor-common/ui';
-import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { isBlockSupportedAtPosition, isEmbedSupportedAtPosition } from '../utils';
+import React, { memo, useCallback, useMemo } from 'react';
+import rafSchedule from 'raf-schd';
+import { findOverflowScrollParent, UnsupportedInline } from '@atlaskit/editor-common/ui';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { Card as SmartCard } from '@atlaskit/smart-card';
+import { registerCard } from '../pm-plugins/actions';
+import OverlayWrapper from '../ui/ConfigureOverlay';
+import { getAwarenessProps } from '../utils';
 import { Card } from './genericCard';
 import { InlineCardWithAwareness } from './inlineCardWithAwareness';
+export const InlineCard = /*#__PURE__*/memo(({
+  node,
+  cardContext,
+  actionOptions,
+  showServerActions,
+  useAlternativePreloader,
+  view,
+  getPos,
+  onClick,
+  onResolve: onRes,
+  isHovered
+}) => {
+  const {
+    url,
+    data
+  } = node.attrs;
+  const scrollContainer = useMemo(() => findOverflowScrollParent(view.dom) || undefined, [view.dom]);
+  const onResolve = useCallback(data => {
+    if (!getPos || typeof getPos === 'boolean') {
+      return;
+    }
+    const {
+      title,
+      url
+    } = data;
+    // don't dispatch immediately since we might be in the middle of
+    // rendering a nodeview
+    rafSchedule(() => {
+      // prosemirror-bump-fix
+      const pos = getPos();
+      if (typeof pos !== 'number') {
+        return;
+      }
+      const tr = view.state.tr;
+      registerCard({
+        title,
+        url,
+        pos
+      })(tr);
+      onRes === null || onRes === void 0 ? void 0 : onRes(tr, title);
+      view.dispatch(tr);
+    })();
+  }, [getPos, view, onRes]);
+  const onError = useCallback(data => {
+    const {
+      url,
+      err
+    } = data;
+    if (err) {
+      throw err;
+    }
+    onResolve({
+      url
+    });
+  }, [onResolve]);
+  const card = useMemo(() => /*#__PURE__*/React.createElement(SmartCard, {
+    key: url,
+    url: url,
+    data: data,
+    appearance: "inline",
+    onClick: onClick,
+    container: scrollContainer,
+    onResolve: onResolve,
+    onError: onError,
+    inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
+    actionOptions: actionOptions,
+    showServerActions: showServerActions,
+    isHovered: isHovered
+  }), [data, isHovered, onError, onResolve, scrollContainer, url, useAlternativePreloader, actionOptions, showServerActions, onClick]);
+
+  // [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 ? /*#__PURE__*/React.createElement(cardContext.Provider, {
+    value: cardContext.value
+  }, card) : data ? card : null;
+});
 const WrappedInlineCardWithAwareness = Card(InlineCardWithAwareness, UnsupportedInline);
+const WrappedInlineCard = Card(InlineCard, UnsupportedInline);
 export function InlineCardNodeView(props) {
   const {
     useAlternativePreloader,
@@ -20,6 +101,20 @@ export function InlineCardNodeView(props) {
     pluginInjectionApi,
     onClickCallback
   } = props;
+  if (fg('platform.linking-platform.smart-links-in-live-pages')) {
+    return /*#__PURE__*/React.createElement(OverlayWrapper, {
+      targetElementPos: getPos(),
+      view: view
+    }, /*#__PURE__*/React.createElement(WrappedInlineCard, {
+      node: node,
+      view: view,
+      getPos: getPos,
+      actionOptions: actionOptions,
+      showServerActions: showServerActions,
+      useAlternativePreloader: useAlternativePreloader,
+      onClickCallback: onClickCallback
+    }));
+  }
   return /*#__PURE__*/React.createElement(WrappedInlineCardWithAwareness, _extends({
     node: node,
     view: view,
@@ -30,16 +125,4 @@ export function InlineCardNodeView(props) {
     pluginInjectionApi: pluginInjectionApi,
     onClickCallback: onClickCallback
   }, 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
-  };
-};
+}