@atlaskit/editor-plugin-card 2.3.7 → 2.4.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-card
 
+## 2.4.0
+
+### Minor Changes
+
+- [#117451](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117451)
+  [`0ecc0082a92e6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0ecc0082a92e6) -
+  [ux] Enable hover cards for inline links in live pages behind ff
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.3.8
+
+### Patch Changes
+
+- [#117409](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117409)
+  [`bf7f33f08064a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bf7f33f08064a) -
+  Use the card provider passed directly to the card plugin to decouple it from editor-core.
+
 ## 2.3.7
 
 ### Patch Changes

package/dist/cjs/nodeviews/inlineCard.js

@@ -10,6 +10,7 @@ exports.InlineCardNodeView = InlineCardNodeView;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _ui = require("@atlaskit/editor-common/ui");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _smartCard = require("@atlaskit/smart-card");
@@ -30,7 +31,9 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
     getPos = _ref.getPos,
     onClick = _ref.onClick,
     onRes = _ref.onResolve,
-    isHovered = _ref.isHovered;
+    isHovered = _ref.isHovered,
+    showHoverPreview = _ref.showHoverPreview,
+    hoverPreviewOptions = _ref.hoverPreviewOptions;
   var _node$attrs = node.attrs,
     url = _node$attrs.url,
     data = _node$attrs.data;
@@ -84,9 +87,11 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
       inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
       actionOptions: actionOptions,
       showServerActions: showServerActions,
-      isHovered: isHovered
+      isHovered: isHovered,
+      showHoverPreview: showHoverPreview,
+      hoverPreviewOptions: hoverPreviewOptions
     });
-  }, [data, isHovered, onError, onResolve, scrollContainer, url, useAlternativePreloader, actionOptions, showServerActions, onClick]);
+  }, [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, showServerActions, isHovered, showHoverPreview, hoverPreviewOptions]);
 
   // [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
@@ -97,6 +102,7 @@ var InlineCard = exports.InlineCard = /*#__PURE__*/(0, _react.memo)(function (_r
 var WrappedInlineCardWithAwareness = (0, _genericCard.Card)(_inlineCardWithAwareness.InlineCardWithAwareness, _ui.UnsupportedInline);
 var WrappedInlineCard = (0, _genericCard.Card)(InlineCard, _ui.UnsupportedInline);
 function InlineCardNodeView(props) {
+  var _useSharedPluginState;
   var useAlternativePreloader = props.useAlternativePreloader,
     node = props.node,
     view = props.view,
@@ -108,7 +114,10 @@ function InlineCardNodeView(props) {
     enableInlineUpgradeFeatures = props.enableInlineUpgradeFeatures,
     pluginInjectionApi = props.pluginInjectionApi,
     onClickCallback = props.onClickCallback;
+  var floatingToolbarNode = (_useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar']).floatingToolbarState) === null || _useSharedPluginState === void 0 || (_useSharedPluginState = _useSharedPluginState.configWithNodeInfo) === null || _useSharedPluginState === void 0 ? void 0 : _useSharedPluginState.node;
   if ((0, _platformFeatureFlags.fg)('platform.linking-platform.smart-links-in-live-pages')) {
+    var showHoverPreview = floatingToolbarNode !== node;
+    var livePagesHoverCardFadeInDelay = 800;
     return /*#__PURE__*/_react.default.createElement(_ConfigureOverlay.default, {
       targetElementPos: getPos(),
       view: view
@@ -119,7 +128,11 @@ function InlineCardNodeView(props) {
       actionOptions: actionOptions,
       showServerActions: showServerActions,
       useAlternativePreloader: useAlternativePreloader,
-      onClickCallback: onClickCallback
+      onClickCallback: onClickCallback,
+      showHoverPreview: showHoverPreview,
+      hoverPreviewOptions: {
+        fadeInDelay: livePagesHoverCardFadeInDelay
+      }
     }));
   }
   return /*#__PURE__*/_react.default.createElement(WrappedInlineCardWithAwareness, (0, _extends2.default)({

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

@@ -166,7 +166,11 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
         };
         var domAtPos = _view.domAtPos.bind(_view);
         var rafCancellationCallbacks = [];
-        pmPluginFactoryParams.providerFactory.subscribe('cardProvider', subscriptionHandler);
+        if (options.provider && (0, _platformFeatureFlags.fg)('platform_editor_get_card_provider_from_config')) {
+          (0, _resolve.handleProvider)('cardProvider', options.provider, _view);
+        } else {
+          pmPluginFactoryParams.providerFactory.subscribe('cardProvider', subscriptionHandler);
+        }
         return {
           update: function update(view, prevState) {
             var _selection$node;
@@ -244,7 +248,9 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
             rafCancellationCallbacks.forEach(function (cancellationCallback) {
               return cancellationCallback();
             });
-            pmPluginFactoryParams.providerFactory.unsubscribe('cardProvider', subscriptionHandler);
+            if (!(0, _platformFeatureFlags.fg)('platform_editor_get_card_provider_from_config')) {
+              pmPluginFactoryParams.providerFactory.unsubscribe('cardProvider', subscriptionHandler);
+            }
           }
         };
       },

package/dist/cjs/ui/HyperlinkToolbarAppearance.js

@@ -42,15 +42,23 @@ var HyperlinkToolbarAppearance = exports.HyperlinkToolbarAppearance = /*#__PURE_
       supportedUrlsMap: new Map()
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getProvider", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      var _this$props$cardOptio;
+      var _this$props$cardOptio2;
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (!_this.cardProvider) {
+            if (!((_this$props$cardOptio = _this.props.cardOptions) !== null && _this$props$cardOptio !== void 0 && _this$props$cardOptio.provider && (0, _platformFeatureFlags.fg)('platform_editor_get_card_provider_from_config'))) {
               _context2.next = 2;
               break;
             }
-            return _context2.abrupt("return", _this.cardProvider);
+            return _context2.abrupt("return", (_this$props$cardOptio2 = _this.props.cardOptions) === null || _this$props$cardOptio2 === void 0 ? void 0 : _this$props$cardOptio2.provider);
           case 2:
+            if (!_this.cardProvider) {
+              _context2.next = 4;
+              break;
+            }
+            return _context2.abrupt("return", _this.cardProvider);
+          case 4:
             return _context2.abrupt("return", new Promise(function (resolve) {
               var providerFactory = _this.props.providerFactory;
               providerFactory.subscribe('cardProvider', /*#__PURE__*/function () {
@@ -80,7 +88,7 @@ var HyperlinkToolbarAppearance = exports.HyperlinkToolbarAppearance = /*#__PURE_
                 };
               }());
             }));
-          case 3:
+          case 5:
           case "end":
             return _context2.stop();
         }
@@ -88,7 +96,7 @@ var HyperlinkToolbarAppearance = exports.HyperlinkToolbarAppearance = /*#__PURE_
     })));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "resolveUrl", /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(url) {
-        var supportedUrlsMap, isUrlSupported, provider, newMap;
+        var supportedUrlsMap, isUrlSupported, _yield$provider$findP, provider, newMap;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -106,26 +114,44 @@ var HyperlinkToolbarAppearance = exports.HyperlinkToolbarAppearance = /*#__PURE_
             case 7:
               provider = _context3.sent;
               _context3.next = 10;
-              return provider.findPattern(url);
+              return provider === null || provider === void 0 ? void 0 : provider.findPattern(url);
             case 10:
-              isUrlSupported = _context3.sent;
-              _context3.next = 16;
+              _context3.t1 = _yield$provider$findP = _context3.sent;
+              _context3.t0 = _context3.t1 !== null;
+              if (!_context3.t0) {
+                _context3.next = 14;
+                break;
+              }
+              _context3.t0 = _yield$provider$findP !== void 0;
+            case 14:
+              if (!_context3.t0) {
+                _context3.next = 18;
+                break;
+              }
+              _context3.t2 = _yield$provider$findP;
+              _context3.next = 19;
               break;
-            case 13:
-              _context3.prev = 13;
-              _context3.t0 = _context3["catch"](4);
+            case 18:
+              _context3.t2 = false;
+            case 19:
+              isUrlSupported = _context3.t2;
+              _context3.next = 25;
+              break;
+            case 22:
+              _context3.prev = 22;
+              _context3.t3 = _context3["catch"](4);
               isUrlSupported = false;
-            case 16:
+            case 25:
               newMap = new Map(supportedUrlsMap);
               newMap.set(url, isUrlSupported);
               _this.setState({
                 supportedUrlsMap: newMap
               });
-            case 19:
+            case 28:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[4, 13]]);
+        }, _callee3, null, [[4, 22]]);
       }));
       return function (_x3) {
         return _ref3.apply(this, arguments);

package/dist/es2019/nodeviews/inlineCard.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { memo, useCallback, useMemo } from 'react';
 import rafSchedule from 'raf-schd';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { findOverflowScrollParent, UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
@@ -19,7 +20,9 @@ export const InlineCard = /*#__PURE__*/memo(({
   getPos,
   onClick,
   onResolve: onRes,
-  isHovered
+  isHovered,
+  showHoverPreview,
+  hoverPreviewOptions
 }) => {
   const {
     url,
@@ -76,8 +79,10 @@ export const InlineCard = /*#__PURE__*/memo(({
     inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
     actionOptions: actionOptions,
     showServerActions: showServerActions,
-    isHovered: isHovered
-  }), [data, isHovered, onError, onResolve, scrollContainer, url, useAlternativePreloader, actionOptions, showServerActions, onClick]);
+    isHovered: isHovered,
+    showHoverPreview: showHoverPreview,
+    hoverPreviewOptions: hoverPreviewOptions
+  }), [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, showServerActions, isHovered, showHoverPreview, hoverPreviewOptions]);
 
   // [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
@@ -88,6 +93,7 @@ export const InlineCard = /*#__PURE__*/memo(({
 const WrappedInlineCardWithAwareness = Card(InlineCardWithAwareness, UnsupportedInline);
 const WrappedInlineCard = Card(InlineCard, UnsupportedInline);
 export function InlineCardNodeView(props) {
+  var _useSharedPluginState, _useSharedPluginState2;
   const {
     useAlternativePreloader,
     node,
@@ -101,7 +107,10 @@ export function InlineCardNodeView(props) {
     pluginInjectionApi,
     onClickCallback
   } = props;
+  const floatingToolbarNode = (_useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['floatingToolbar']).floatingToolbarState) === null || _useSharedPluginState === void 0 ? void 0 : (_useSharedPluginState2 = _useSharedPluginState.configWithNodeInfo) === null || _useSharedPluginState2 === void 0 ? void 0 : _useSharedPluginState2.node;
   if (fg('platform.linking-platform.smart-links-in-live-pages')) {
+    const showHoverPreview = floatingToolbarNode !== node;
+    const livePagesHoverCardFadeInDelay = 800;
     return /*#__PURE__*/React.createElement(OverlayWrapper, {
       targetElementPos: getPos(),
       view: view
@@ -112,7 +121,11 @@ export function InlineCardNodeView(props) {
       actionOptions: actionOptions,
       showServerActions: showServerActions,
       useAlternativePreloader: useAlternativePreloader,
-      onClickCallback: onClickCallback
+      onClickCallback: onClickCallback,
+      showHoverPreview: showHoverPreview,
+      hoverPreviewOptions: {
+        fadeInDelay: livePagesHoverCardFadeInDelay
+      }
     }));
   }
   return /*#__PURE__*/React.createElement(WrappedInlineCardWithAwareness, _extends({

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

@@ -6,7 +6,7 @@ import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg, getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { eventsFromTransaction } from '../analytics/events-from-tr';
 import { isLocalStorageKeyDiscovered } from '../common/local-storage';
 import { BlockCard } from '../nodeviews/blockCard';
@@ -149,7 +149,11 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
       const subscriptionHandler = (name, provider) => handleProvider(name, provider, view);
       const domAtPos = view.domAtPos.bind(view);
       const rafCancellationCallbacks = [];
-      pmPluginFactoryParams.providerFactory.subscribe('cardProvider', subscriptionHandler);
+      if (options.provider && fg('platform_editor_get_card_provider_from_config')) {
+        handleProvider('cardProvider', options.provider, view);
+      } else {
+        pmPluginFactoryParams.providerFactory.subscribe('cardProvider', subscriptionHandler);
+      }
       return {
         update(view, prevState) {
           var _selection$node;
@@ -233,7 +237,9 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
         destroy() {
           // Cancel any outstanding raf callbacks.
           rafCancellationCallbacks.forEach(cancellationCallback => cancellationCallback());
-          pmPluginFactoryParams.providerFactory.unsubscribe('cardProvider', subscriptionHandler);
+          if (!fg('platform_editor_get_card_provider_from_config')) {
+            pmPluginFactoryParams.providerFactory.unsubscribe('cardProvider', subscriptionHandler);
+          }
         }
       };
     },

package/dist/es2019/ui/HyperlinkToolbarAppearance.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React, { Component } from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg, getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { DatasourceAppearanceButton } from './DatasourceAppearanceButton';
 import { EditDatasourceButton } from './EditDatasourceButton';
@@ -15,6 +15,11 @@ export class HyperlinkToolbarAppearance extends Component {
       supportedUrlsMap: new Map()
     });
     _defineProperty(this, "getProvider", async () => {
+      var _this$props$cardOptio;
+      if ((_this$props$cardOptio = this.props.cardOptions) !== null && _this$props$cardOptio !== void 0 && _this$props$cardOptio.provider && fg('platform_editor_get_card_provider_from_config')) {
+        var _this$props$cardOptio2;
+        return (_this$props$cardOptio2 = this.props.cardOptions) === null || _this$props$cardOptio2 === void 0 ? void 0 : _this$props$cardOptio2.provider;
+      }
       if (this.cardProvider) {
         return this.cardProvider;
       }
@@ -40,8 +45,9 @@ export class HyperlinkToolbarAppearance extends Component {
       }
       let isUrlSupported = false;
       try {
+        var _await$provider$findP;
         const provider = await this.getProvider();
-        isUrlSupported = await provider.findPattern(url);
+        isUrlSupported = (_await$provider$findP = await (provider === null || provider === void 0 ? void 0 : provider.findPattern(url))) !== null && _await$provider$findP !== void 0 ? _await$provider$findP : false;
       } catch (error) {
         isUrlSupported = false;
       }

package/dist/esm/nodeviews/inlineCard.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { memo, useCallback, useMemo } from 'react';
 import rafSchedule from 'raf-schd';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { findOverflowScrollParent, UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
@@ -19,7 +20,9 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
     getPos = _ref.getPos,
     onClick = _ref.onClick,
     onRes = _ref.onResolve,
-    isHovered = _ref.isHovered;
+    isHovered = _ref.isHovered,
+    showHoverPreview = _ref.showHoverPreview,
+    hoverPreviewOptions = _ref.hoverPreviewOptions;
   var _node$attrs = node.attrs,
     url = _node$attrs.url,
     data = _node$attrs.data;
@@ -73,9 +76,11 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
       inlinePreloaderStyle: useAlternativePreloader ? 'on-right-without-skeleton' : undefined,
       actionOptions: actionOptions,
       showServerActions: showServerActions,
-      isHovered: isHovered
+      isHovered: isHovered,
+      showHoverPreview: showHoverPreview,
+      hoverPreviewOptions: hoverPreviewOptions
     });
-  }, [data, isHovered, onError, onResolve, scrollContainer, url, useAlternativePreloader, actionOptions, showServerActions, onClick]);
+  }, [url, data, onClick, scrollContainer, onResolve, onError, useAlternativePreloader, actionOptions, showServerActions, isHovered, showHoverPreview, hoverPreviewOptions]);
 
   // [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
@@ -86,6 +91,7 @@ export var InlineCard = /*#__PURE__*/memo(function (_ref) {
 var WrappedInlineCardWithAwareness = Card(InlineCardWithAwareness, UnsupportedInline);
 var WrappedInlineCard = Card(InlineCard, UnsupportedInline);
 export function InlineCardNodeView(props) {
+  var _useSharedPluginState;
   var useAlternativePreloader = props.useAlternativePreloader,
     node = props.node,
     view = props.view,
@@ -97,7 +103,10 @@ export function InlineCardNodeView(props) {
     enableInlineUpgradeFeatures = props.enableInlineUpgradeFeatures,
     pluginInjectionApi = props.pluginInjectionApi,
     onClickCallback = props.onClickCallback;
+  var floatingToolbarNode = (_useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['floatingToolbar']).floatingToolbarState) === null || _useSharedPluginState === void 0 || (_useSharedPluginState = _useSharedPluginState.configWithNodeInfo) === null || _useSharedPluginState === void 0 ? void 0 : _useSharedPluginState.node;
   if (fg('platform.linking-platform.smart-links-in-live-pages')) {
+    var showHoverPreview = floatingToolbarNode !== node;
+    var livePagesHoverCardFadeInDelay = 800;
     return /*#__PURE__*/React.createElement(OverlayWrapper, {
       targetElementPos: getPos(),
       view: view
@@ -108,7 +117,11 @@ export function InlineCardNodeView(props) {
       actionOptions: actionOptions,
       showServerActions: showServerActions,
       useAlternativePreloader: useAlternativePreloader,
-      onClickCallback: onClickCallback
+      onClickCallback: onClickCallback,
+      showHoverPreview: showHoverPreview,
+      hoverPreviewOptions: {
+        fadeInDelay: livePagesHoverCardFadeInDelay
+      }
     }));
   }
   return /*#__PURE__*/React.createElement(WrappedInlineCardWithAwareness, _extends({

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

@@ -10,7 +10,7 @@ import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg, getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { eventsFromTransaction } from '../analytics/events-from-tr';
 import { isLocalStorageKeyDiscovered } from '../common/local-storage';
 import { BlockCard } from '../nodeviews/blockCard';
@@ -153,7 +153,11 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
         };
         var domAtPos = _view.domAtPos.bind(_view);
         var rafCancellationCallbacks = [];
-        pmPluginFactoryParams.providerFactory.subscribe('cardProvider', subscriptionHandler);
+        if (options.provider && fg('platform_editor_get_card_provider_from_config')) {
+          handleProvider('cardProvider', options.provider, _view);
+        } else {
+          pmPluginFactoryParams.providerFactory.subscribe('cardProvider', subscriptionHandler);
+        }
         return {
           update: function update(view, prevState) {
             var _selection$node;
@@ -231,7 +235,9 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             rafCancellationCallbacks.forEach(function (cancellationCallback) {
               return cancellationCallback();
             });
-            pmPluginFactoryParams.providerFactory.unsubscribe('cardProvider', subscriptionHandler);
+            if (!fg('platform_editor_get_card_provider_from_config')) {
+              pmPluginFactoryParams.providerFactory.unsubscribe('cardProvider', subscriptionHandler);
+            }
           }
         };
       },

package/dist/esm/ui/HyperlinkToolbarAppearance.js

@@ -12,7 +12,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import React, { Component } from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg, getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { DatasourceAppearanceButton } from './DatasourceAppearanceButton';
 import { EditDatasourceButton } from './EditDatasourceButton';
@@ -32,15 +32,23 @@ export var HyperlinkToolbarAppearance = /*#__PURE__*/function (_Component) {
       supportedUrlsMap: new Map()
     });
     _defineProperty(_assertThisInitialized(_this), "getProvider", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var _this$props$cardOptio;
+      var _this$props$cardOptio2;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (!_this.cardProvider) {
+            if (!((_this$props$cardOptio = _this.props.cardOptions) !== null && _this$props$cardOptio !== void 0 && _this$props$cardOptio.provider && fg('platform_editor_get_card_provider_from_config'))) {
               _context2.next = 2;
               break;
             }
-            return _context2.abrupt("return", _this.cardProvider);
+            return _context2.abrupt("return", (_this$props$cardOptio2 = _this.props.cardOptions) === null || _this$props$cardOptio2 === void 0 ? void 0 : _this$props$cardOptio2.provider);
           case 2:
+            if (!_this.cardProvider) {
+              _context2.next = 4;
+              break;
+            }
+            return _context2.abrupt("return", _this.cardProvider);
+          case 4:
             return _context2.abrupt("return", new Promise(function (resolve) {
               var providerFactory = _this.props.providerFactory;
               providerFactory.subscribe('cardProvider', /*#__PURE__*/function () {
@@ -70,7 +78,7 @@ export var HyperlinkToolbarAppearance = /*#__PURE__*/function (_Component) {
                 };
               }());
             }));
-          case 3:
+          case 5:
           case "end":
             return _context2.stop();
         }
@@ -78,7 +86,7 @@ export var HyperlinkToolbarAppearance = /*#__PURE__*/function (_Component) {
     })));
     _defineProperty(_assertThisInitialized(_this), "resolveUrl", /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(url) {
-        var supportedUrlsMap, isUrlSupported, provider, newMap;
+        var supportedUrlsMap, isUrlSupported, _yield$provider$findP, provider, newMap;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -96,26 +104,44 @@ export var HyperlinkToolbarAppearance = /*#__PURE__*/function (_Component) {
             case 7:
               provider = _context3.sent;
               _context3.next = 10;
-              return provider.findPattern(url);
+              return provider === null || provider === void 0 ? void 0 : provider.findPattern(url);
             case 10:
-              isUrlSupported = _context3.sent;
-              _context3.next = 16;
+              _context3.t1 = _yield$provider$findP = _context3.sent;
+              _context3.t0 = _context3.t1 !== null;
+              if (!_context3.t0) {
+                _context3.next = 14;
+                break;
+              }
+              _context3.t0 = _yield$provider$findP !== void 0;
+            case 14:
+              if (!_context3.t0) {
+                _context3.next = 18;
+                break;
+              }
+              _context3.t2 = _yield$provider$findP;
+              _context3.next = 19;
               break;
-            case 13:
-              _context3.prev = 13;
-              _context3.t0 = _context3["catch"](4);
+            case 18:
+              _context3.t2 = false;
+            case 19:
+              isUrlSupported = _context3.t2;
+              _context3.next = 25;
+              break;
+            case 22:
+              _context3.prev = 22;
+              _context3.t3 = _context3["catch"](4);
               isUrlSupported = false;
-            case 16:
+            case 25:
               newMap = new Map(supportedUrlsMap);
               newMap.set(url, isUrlSupported);
               _this.setState({
                 supportedUrlsMap: newMap
               });
-            case 19:
+            case 28:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[4, 13]]);
+        }, _callee3, null, [[4, 22]]);
       }));
       return function (_x3) {
         return _ref3.apply(this, arguments);

package/dist/types/nodeviews/genericCard.d.ts

@@ -40,6 +40,8 @@ export interface CardProps extends CardNodeViewProps {
     actionOptions?: BaseCardProps['actionOptions'];
     pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>;
     onClickCallback?: OnClickCallback;
+    showHoverPreview?: BaseCardProps['showHoverPreview'];
+    hoverPreviewOptions?: BaseCardProps['hoverPreviewOptions'];
 }
 export interface SmartCardProps extends CardProps {
     pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>;

package/dist/types/nodeviews/inlineCard.d.ts

@@ -2,6 +2,6 @@ import React from 'react';
 import type { InlineNodeViewComponentProps } from '@atlaskit/editor-common/react-node-view';
 import type { SmartCardProps } from './genericCard';
 import { type InlineCardWithAwarenessProps } from './inlineCardWithAwareness';
-export declare const InlineCard: React.MemoExoticComponent<({ node, cardContext, actionOptions, showServerActions, useAlternativePreloader, view, getPos, onClick, onResolve: onRes, isHovered, }: SmartCardProps) => JSX.Element | null>;
+export declare const InlineCard: React.MemoExoticComponent<({ node, cardContext, actionOptions, showServerActions, useAlternativePreloader, view, getPos, onClick, onResolve: onRes, isHovered, showHoverPreview, hoverPreviewOptions, }: SmartCardProps) => JSX.Element | null>;
 export type InlineCardNodeViewProps = Pick<SmartCardProps, 'useAlternativePreloader' | 'actionOptions' | 'showServerActions' | 'allowEmbeds' | 'allowBlockCards' | 'enableInlineUpgradeFeatures' | 'pluginInjectionApi' | 'onClickCallback'>;
 export declare function InlineCardNodeView(props: InlineNodeViewComponentProps & InlineCardNodeViewProps & InlineCardWithAwarenessProps): JSX.Element;

package/dist/types-ts4.5/nodeviews/genericCard.d.ts

@@ -40,6 +40,8 @@ export interface CardProps extends CardNodeViewProps {
     actionOptions?: BaseCardProps['actionOptions'];
     pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>;
     onClickCallback?: OnClickCallback;
+    showHoverPreview?: BaseCardProps['showHoverPreview'];
+    hoverPreviewOptions?: BaseCardProps['hoverPreviewOptions'];
 }
 export interface SmartCardProps extends CardProps {
     pluginInjectionApi?: ExtractInjectionAPI<typeof cardPlugin>;

package/dist/types-ts4.5/nodeviews/inlineCard.d.ts

@@ -2,6 +2,6 @@ import React from 'react';
 import type { InlineNodeViewComponentProps } from '@atlaskit/editor-common/react-node-view';
 import type { SmartCardProps } from './genericCard';
 import { type InlineCardWithAwarenessProps } from './inlineCardWithAwareness';
-export declare const InlineCard: React.MemoExoticComponent<({ node, cardContext, actionOptions, showServerActions, useAlternativePreloader, view, getPos, onClick, onResolve: onRes, isHovered, }: SmartCardProps) => JSX.Element | null>;
+export declare const InlineCard: React.MemoExoticComponent<({ node, cardContext, actionOptions, showServerActions, useAlternativePreloader, view, getPos, onClick, onResolve: onRes, isHovered, showHoverPreview, hoverPreviewOptions, }: SmartCardProps) => JSX.Element | null>;
 export type InlineCardNodeViewProps = Pick<SmartCardProps, 'useAlternativePreloader' | 'actionOptions' | 'showServerActions' | 'allowEmbeds' | 'allowBlockCards' | 'enableInlineUpgradeFeatures' | 'pluginInjectionApi' | 'onClickCallback'>;
 export declare function InlineCardNodeView(props: InlineNodeViewComponentProps & InlineCardNodeViewProps & InlineCardWithAwarenessProps): JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "2.3.7",
+	"version": "2.4.0",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,7 +36,7 @@
 		"@atlaskit/analytics-next": "^9.3.0",
 		"@atlaskit/button": "^18.1.0",
 		"@atlaskit/custom-steps": "^0.4.0",
-		"@atlaskit/dropdown-menu": "^12.13.0",
+		"@atlaskit/dropdown-menu": "^12.14.0",
 		"@atlaskit/editor-common": "^84.0.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-plugin-decorations": "^1.1.0",
@@ -58,7 +58,7 @@
 		"@atlaskit/menu": "2.7.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^10.0.0",
-		"@atlaskit/smart-card": "^27.8.0",
+		"@atlaskit/smart-card": "^27.9.0",
 		"@atlaskit/theme": "^12.11.0",
 		"@atlaskit/tokens": "^1.53.0",
 		"@atlaskit/tooltip": "^18.5.0",
@@ -136,6 +136,9 @@
 		},
 		"platform.linking-platform.editor-datasource-typeguards": {
 			"type": "boolean"
+		},
+		"platform_editor_get_card_provider_from_config": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {