@atlaskit/editor-plugin-card 2.5.1 → 2.6.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-card
 
+## 2.6.0
+
+### Minor Changes
+
+- [#119966](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/119966)
+  [`596ad24e38929`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/596ad24e38929) -
+  Clean up typescript references to LegacyPortalProviderAPI
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.5.2
+
+### Patch Changes
+
+- [#119704](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/119704)
+  [`2308f93f42b1a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2308f93f42b1a) -
+  EDM-10361 Show highlighted border on hover of inline card configure overlay
+- Updated dependencies
+
 ## 2.5.1
 
 ### Patch Changes

package/dist/cjs/nodeviews/datasource.js

@@ -225,7 +225,7 @@ var Datasource = exports.Datasource = /*#__PURE__*/function (_ReactNodeView) {
     var _props$pluginInjectio, _sharedState$currentS;
     var _this2;
     (0, _classCallCheck2.default)(this, Datasource);
-    _this2 = _super2.call(this, props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props, undefined, true, undefined, props.hasIntlContext);
+    _this2 = _super2.call(this, props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props);
     var sharedState = props === null || props === void 0 || (_props$pluginInjectio = props.pluginInjectionApi) === null || _props$pluginInjectio === void 0 || (_props$pluginInjectio = _props$pluginInjectio.width) === null || _props$pluginInjectio === void 0 ? void 0 : _props$pluginInjectio.sharedState;
     _this2.tableWidth = sharedState === null || sharedState === void 0 || (_sharedState$currentS = sharedState.currentState()) === null || _sharedState$currentS === void 0 ? void 0 : _sharedState$currentS.width;
     _this2.isNodeNested = props.isNodeNested;

package/dist/cjs/nodeviews/inlineCard.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.InlineCard = void 0;
 exports.InlineCardNodeView = InlineCardNodeView;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _hooks = require("@atlaskit/editor-common/hooks");
@@ -114,14 +115,20 @@ function InlineCardNodeView(props) {
     enableInlineUpgradeFeatures = props.enableInlineUpgradeFeatures,
     pluginInjectionApi = props.pluginInjectionApi,
     onClickCallback = props.onClickCallback;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    isOverlayHovered = _useState2[0],
+    setIsOverlayHovered = _useState2[1];
   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
+      view: view,
+      isHoveredCallback: setIsOverlayHovered
     }, /*#__PURE__*/_react.default.createElement(WrappedInlineCard, {
+      isHovered: isOverlayHovered,
       node: node,
       view: view,
       getPos: getPos,

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

@@ -41,7 +41,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK = 'smart-link-upgrade-pulse';
 var ALLOW_EVENTS_CLASSNAME = exports.ALLOW_EVENTS_CLASSNAME = 'card-plugin-element-allow-events';
 var stopEvent = exports.stopEvent = function stopEvent(event) {
-  if (!(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-links-in-live-pages')) {
+  if (!(0, _platformFeatureFlags.fg)('platform.linking-platform.smart-links-in-live-pages')) {
     return false;
   }
   var target = event.target;
@@ -124,7 +124,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
             var events = (0, _eventsFromTr.eventsFromTransaction)(tr, prevEditorState);
             cardPluginEvents.push.apply(cardPluginEvents, (0, _toConsumableArray2.default)(events));
           }
-          if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar') && !meta) {
+          if (!meta && (0, _platformFeatureFlags.fg)('platform.linking-platform.enable-datasource-appearance-toolbar')) {
             if (pluginState.datasourceTableRef) {
               if (!(tr.selection instanceof _state.NodeSelection) || !tr.selection.node.attrs.datasource) {
                 // disable resize button when switching from datasource to block card
@@ -195,7 +195,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
                 };
 
                 // since we use the plugin state, which is a shared state, we need to update the datasourceTableRef, layout on each selection
-                var layout = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.editor-datasource-typeguards') ? getLayout() : (node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || _linkingCommon.DATASOURCE_DEFAULT_LAYOUT;
+                var layout = (0, _platformFeatureFlags.fg)('platform.linking-platform.editor-datasource-typeguards') ? getLayout() : (node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || _linkingCommon.DATASOURCE_DEFAULT_LAYOUT;
                 var isNested = selection.$anchor.depth > 0;
 
                 // we want to disable resize button when datasource table is nested by not setting then datasourceTableRef on selection
@@ -268,8 +268,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
               pluginInjectionApi: pluginInjectionApi,
               onClickCallback: options.onClickCallback
             };
-            var hasIntlContext = true;
-            var isDatasource = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.editor-datasource-typeguards') ? (0, _utils4.isDatasourceNode)(node) : !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
+            var isDatasource = (0, _platformFeatureFlags.fg)('platform.linking-platform.editor-datasource-typeguards') ? (0, _utils4.isDatasourceNode)(node) : !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
             if (isDatasource) {
               var _node$attrs4;
               if (options.allowDatasource && platform !== 'mobile' && (0, _utils.canRenderDatasource)(node === null || node === void 0 || (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 || (_node$attrs4 = _node$attrs4.datasource) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.id)) {
@@ -282,7 +281,6 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
                   getPos: getPos,
                   portalProviderAPI: portalProviderAPI,
                   eventDispatcher: eventDispatcher,
-                  hasIntlContext: hasIntlContext,
                   pluginInjectionApi: pluginInjectionApi,
                   isNodeNested: isNodeNested
                 }).init();
@@ -290,7 +288,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
                 return inlineCardViewProducer(node, view, getPos, decorations);
               }
             }
-            return new _blockCard.BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
+            return new _blockCard.BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined).init();
           },
           embedCard: function embedCard(node, view, getPos) {
             var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
@@ -307,8 +305,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
               showServerActions: showServerActions,
               onClickCallback: options.onClickCallback
             };
-            var hasIntlContext = true;
-            return new _embedCard.EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
+            return new _embedCard.EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined).init();
           }
         }
       }, enableInlineUpgradeFeatures && {

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

@@ -21,7 +21,8 @@ var ConfigureOverlayWrapperStyles = (0, _react2.css)({
 var OverlayWrapper = function OverlayWrapper(_ref) {
   var view = _ref.view,
     targetElementPos = _ref.targetElementPos,
-    children = _ref.children;
+    children = _ref.children,
+    hoverCallback = _ref.isHoveredCallback;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     showConfigureButton = _useState2[0],
@@ -38,11 +39,13 @@ var OverlayWrapper = function OverlayWrapper(_ref) {
   }, []);
   return (0, _react2.jsx)("span", {
     onMouseEnter: function onMouseEnter() {
-      return setShowConfigureButton(true);
+      setShowConfigureButton(true);
+      hoverCallback(true);
     },
     onMouseLeave: function onMouseLeave() {
       if (!dropdownOpen) {
         setShowConfigureButton(false);
+        hoverCallback(false);
       }
     },
     "data-testid": "inline-card-overlay-wrapper"

package/dist/es2019/nodeviews/datasource.js

@@ -184,7 +184,7 @@ _defineProperty(DatasourceComponent, "contextTypes", {
 export class Datasource extends ReactNodeView {
   constructor(props) {
     var _props$pluginInjectio, _props$pluginInjectio2, _sharedState$currentS;
-    super(props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props, undefined, true, undefined, props.hasIntlContext);
+    super(props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props);
     const sharedState = props === null || props === void 0 ? void 0 : (_props$pluginInjectio = props.pluginInjectionApi) === null || _props$pluginInjectio === void 0 ? void 0 : (_props$pluginInjectio2 = _props$pluginInjectio.width) === null || _props$pluginInjectio2 === void 0 ? void 0 : _props$pluginInjectio2.sharedState;
     this.tableWidth = sharedState === null || sharedState === void 0 ? void 0 : (_sharedState$currentS = sharedState.currentState()) === null || _sharedState$currentS === void 0 ? void 0 : _sharedState$currentS.width;
     this.isNodeNested = props.isNodeNested;

package/dist/es2019/nodeviews/inlineCard.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { memo, useCallback, useMemo } from 'react';
+import React, { memo, useCallback, useMemo, useState } from 'react';
 import rafSchedule from 'raf-schd';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { findOverflowScrollParent, UnsupportedInline } from '@atlaskit/editor-common/ui';
@@ -107,14 +107,17 @@ export function InlineCardNodeView(props) {
     pluginInjectionApi,
     onClickCallback
   } = props;
+  const [isOverlayHovered, setIsOverlayHovered] = useState(false);
   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
+      view: view,
+      isHoveredCallback: setIsOverlayHovered
     }, /*#__PURE__*/React.createElement(WrappedInlineCard, {
+      isHovered: isOverlayHovered,
       node: node,
       view: view,
       getPos: getPos,

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 { fg, getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { eventsFromTransaction } from '../analytics/events-from-tr';
 import { isLocalStorageKeyDiscovered } from '../common/local-storage';
 import { BlockCard } from '../nodeviews/blockCard';
@@ -24,7 +24,7 @@ export { pluginKey } from './plugin-key';
 const LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK = 'smart-link-upgrade-pulse';
 export const ALLOW_EVENTS_CLASSNAME = 'card-plugin-element-allow-events';
 export const stopEvent = event => {
-  if (!getBooleanFF('platform.linking-platform.smart-links-in-live-pages')) {
+  if (!fg('platform.linking-platform.smart-links-in-live-pages')) {
     return false;
   }
   const target = event.target;
@@ -108,7 +108,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
           const events = eventsFromTransaction(tr, prevEditorState);
           cardPluginEvents.push(...events);
         }
-        if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && !meta) {
+        if (!meta && fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
           if (pluginState.datasourceTableRef) {
             if (!(tr.selection instanceof NodeSelection) || !tr.selection.node.attrs.datasource) {
               // disable resize button when switching from datasource to block card
@@ -184,7 +184,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
               };
 
               // since we use the plugin state, which is a shared state, we need to update the datasourceTableRef, layout on each selection
-              const layout = getBooleanFF('platform.linking-platform.editor-datasource-typeguards') ? getLayout() : (node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || DATASOURCE_DEFAULT_LAYOUT;
+              const layout = fg('platform.linking-platform.editor-datasource-typeguards') ? getLayout() : (node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || DATASOURCE_DEFAULT_LAYOUT;
               const isNested = selection.$anchor.depth > 0;
 
               // we want to disable resize button when datasource table is nested by not setting then datasourceTableRef on selection
@@ -259,8 +259,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
             pluginInjectionApi,
             onClickCallback: options.onClickCallback
           };
-          const hasIntlContext = true;
-          const isDatasource = getBooleanFF('platform.linking-platform.editor-datasource-typeguards') ? isDatasourceNode(node) : !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
+          const isDatasource = fg('platform.linking-platform.editor-datasource-typeguards') ? isDatasourceNode(node) : !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
           if (isDatasource) {
             var _node$attrs4, _node$attrs4$datasour;
             if (options.allowDatasource && platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : (_node$attrs4$datasour = _node$attrs4.datasource) === null || _node$attrs4$datasour === void 0 ? void 0 : _node$attrs4$datasour.id)) {
@@ -273,7 +272,6 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
                 getPos,
                 portalProviderAPI,
                 eventDispatcher,
-                hasIntlContext,
                 pluginInjectionApi,
                 isNodeNested
               }).init();
@@ -281,7 +279,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
               return inlineCardViewProducer(node, view, getPos, decorations);
             }
           }
-          return new BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
+          return new BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined).init();
         },
         embedCard: (node, view, getPos) => {
           const {
@@ -300,8 +298,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
             showServerActions,
             onClickCallback: options.onClickCallback
           };
-          const hasIntlContext = true;
-          return new EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
+          return new EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined).init();
         }
       },
       ...(enableInlineUpgradeFeatures && {

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

@@ -12,7 +12,8 @@ const ConfigureOverlayWrapperStyles = css({
 const OverlayWrapper = ({
   view,
   targetElementPos,
-  children
+  children,
+  isHoveredCallback: hoverCallback
 }) => {
   const [showConfigureButton, setShowConfigureButton] = useState(false);
   const [dropdownOpen, setDropdownOpen] = useState(false);
@@ -23,10 +24,14 @@ const OverlayWrapper = ({
     }
   }, []);
   return jsx("span", {
-    onMouseEnter: () => setShowConfigureButton(true),
+    onMouseEnter: () => {
+      setShowConfigureButton(true);
+      hoverCallback(true);
+    },
     onMouseLeave: () => {
       if (!dropdownOpen) {
         setShowConfigureButton(false);
+        hoverCallback(false);
       }
     },
     "data-testid": "inline-card-overlay-wrapper"

package/dist/esm/nodeviews/datasource.js

@@ -221,7 +221,7 @@ export var Datasource = /*#__PURE__*/function (_ReactNodeView) {
     var _props$pluginInjectio, _sharedState$currentS;
     var _this2;
     _classCallCheck(this, Datasource);
-    _this2 = _super2.call(this, props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props, undefined, true, undefined, props.hasIntlContext);
+    _this2 = _super2.call(this, props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props);
     var sharedState = props === null || props === void 0 || (_props$pluginInjectio = props.pluginInjectionApi) === null || _props$pluginInjectio === void 0 || (_props$pluginInjectio = _props$pluginInjectio.width) === null || _props$pluginInjectio === void 0 ? void 0 : _props$pluginInjectio.sharedState;
     _this2.tableWidth = sharedState === null || sharedState === void 0 || (_sharedState$currentS = sharedState.currentState()) === null || _sharedState$currentS === void 0 ? void 0 : _sharedState$currentS.width;
     _this2.isNodeNested = props.isNodeNested;

package/dist/esm/nodeviews/inlineCard.js

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React, { memo, useCallback, useMemo } from 'react';
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React, { memo, useCallback, useMemo, useState } from 'react';
 import rafSchedule from 'raf-schd';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { findOverflowScrollParent, UnsupportedInline } from '@atlaskit/editor-common/ui';
@@ -103,14 +104,20 @@ export function InlineCardNodeView(props) {
     enableInlineUpgradeFeatures = props.enableInlineUpgradeFeatures,
     pluginInjectionApi = props.pluginInjectionApi,
     onClickCallback = props.onClickCallback;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isOverlayHovered = _useState2[0],
+    setIsOverlayHovered = _useState2[1];
   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
+      view: view,
+      isHoveredCallback: setIsOverlayHovered
     }, /*#__PURE__*/React.createElement(WrappedInlineCard, {
+      isHovered: isOverlayHovered,
       node: node,
       view: view,
       getPos: getPos,

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 { fg, getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { eventsFromTransaction } from '../analytics/events-from-tr';
 import { isLocalStorageKeyDiscovered } from '../common/local-storage';
 import { BlockCard } from '../nodeviews/blockCard';
@@ -28,7 +28,7 @@ export { pluginKey } from './plugin-key';
 var LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK = 'smart-link-upgrade-pulse';
 export var ALLOW_EVENTS_CLASSNAME = 'card-plugin-element-allow-events';
 export var stopEvent = function stopEvent(event) {
-  if (!getBooleanFF('platform.linking-platform.smart-links-in-live-pages')) {
+  if (!fg('platform.linking-platform.smart-links-in-live-pages')) {
     return false;
   }
   var target = event.target;
@@ -111,7 +111,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             var events = eventsFromTransaction(tr, prevEditorState);
             cardPluginEvents.push.apply(cardPluginEvents, _toConsumableArray(events));
           }
-          if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && !meta) {
+          if (!meta && fg('platform.linking-platform.enable-datasource-appearance-toolbar')) {
             if (pluginState.datasourceTableRef) {
               if (!(tr.selection instanceof NodeSelection) || !tr.selection.node.attrs.datasource) {
                 // disable resize button when switching from datasource to block card
@@ -182,7 +182,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
                 };
 
                 // since we use the plugin state, which is a shared state, we need to update the datasourceTableRef, layout on each selection
-                var layout = getBooleanFF('platform.linking-platform.editor-datasource-typeguards') ? getLayout() : (node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || DATASOURCE_DEFAULT_LAYOUT;
+                var layout = fg('platform.linking-platform.editor-datasource-typeguards') ? getLayout() : (node === null || node === void 0 || (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.layout) || DATASOURCE_DEFAULT_LAYOUT;
                 var isNested = selection.$anchor.depth > 0;
 
                 // we want to disable resize button when datasource table is nested by not setting then datasourceTableRef on selection
@@ -255,8 +255,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
               pluginInjectionApi: pluginInjectionApi,
               onClickCallback: options.onClickCallback
             };
-            var hasIntlContext = true;
-            var isDatasource = getBooleanFF('platform.linking-platform.editor-datasource-typeguards') ? isDatasourceNode(node) : !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
+            var isDatasource = fg('platform.linking-platform.editor-datasource-typeguards') ? isDatasourceNode(node) : !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
             if (isDatasource) {
               var _node$attrs4;
               if (options.allowDatasource && platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 || (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 || (_node$attrs4 = _node$attrs4.datasource) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.id)) {
@@ -269,7 +268,6 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
                   getPos: getPos,
                   portalProviderAPI: portalProviderAPI,
                   eventDispatcher: eventDispatcher,
-                  hasIntlContext: hasIntlContext,
                   pluginInjectionApi: pluginInjectionApi,
                   isNodeNested: isNodeNested
                 }).init();
@@ -277,7 +275,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
                 return inlineCardViewProducer(node, view, getPos, decorations);
               }
             }
-            return new BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
+            return new BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined).init();
           },
           embedCard: function embedCard(node, view, getPos) {
             var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
@@ -294,8 +292,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
               showServerActions: showServerActions,
               onClickCallback: options.onClickCallback
             };
-            var hasIntlContext = true;
-            return new EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
+            return new EmbedCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined).init();
           }
         }
       }, enableInlineUpgradeFeatures && {

package/dist/esm/ui/ConfigureOverlay/index.js

@@ -13,7 +13,8 @@ var ConfigureOverlayWrapperStyles = css({
 var OverlayWrapper = function OverlayWrapper(_ref) {
   var view = _ref.view,
     targetElementPos = _ref.targetElementPos,
-    children = _ref.children;
+    children = _ref.children,
+    hoverCallback = _ref.isHoveredCallback;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showConfigureButton = _useState2[0],
@@ -30,11 +31,13 @@ var OverlayWrapper = function OverlayWrapper(_ref) {
   }, []);
   return jsx("span", {
     onMouseEnter: function onMouseEnter() {
-      return setShowConfigureButton(true);
+      setShowConfigureButton(true);
+      hoverCallback(true);
     },
     onMouseLeave: function onMouseLeave() {
       if (!dropdownOpen) {
         setShowConfigureButton(false);
+        hoverCallback(false);
       }
     },
     "data-testid": "inline-card-overlay-wrapper"

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

@@ -4,7 +4,6 @@ import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { type PortalProviderAPI } from '@atlaskit/editor-common/portal';
-import type { LegacyPortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import type { getPosHandler, ReactComponentProps } from '@atlaskit/editor-common/react-node-view';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
@@ -15,9 +14,8 @@ export interface DatasourceProps extends ReactComponentProps {
     node: PMNode;
     view: EditorView;
     getPos: getPosHandler;
-    portalProviderAPI: LegacyPortalProviderAPI | PortalProviderAPI;
+    portalProviderAPI: PortalProviderAPI;
     eventDispatcher: EventDispatcher;
-    hasIntlContext: boolean;
     pluginInjectionApi: ExtractInjectionAPI<typeof cardPlugin> | undefined;
     isNodeNested?: boolean;
 }

package/dist/types/ui/ConfigureOverlay/index.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="react" />
 import { jsx } from '@emotion/react';
 import { type EditorView } from '@atlaskit/editor-prosemirror/view';
-declare const OverlayWrapper: ({ view, targetElementPos, children, }: {
+declare const OverlayWrapper: ({ view, targetElementPos, children, isHoveredCallback: hoverCallback, }: {
     view: EditorView;
     targetElementPos: number | undefined;
     children: JSX.Element;
+    /** Fired when the mouse enters or leaves the overlay button */
+    isHoveredCallback: (isHovered: boolean) => void;
 }) => jsx.JSX.Element;
 export default OverlayWrapper;

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

@@ -4,7 +4,6 @@ import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { type PortalProviderAPI } from '@atlaskit/editor-common/portal';
-import type { LegacyPortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import type { getPosHandler, ReactComponentProps } from '@atlaskit/editor-common/react-node-view';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
@@ -15,9 +14,8 @@ export interface DatasourceProps extends ReactComponentProps {
     node: PMNode;
     view: EditorView;
     getPos: getPosHandler;
-    portalProviderAPI: LegacyPortalProviderAPI | PortalProviderAPI;
+    portalProviderAPI: PortalProviderAPI;
     eventDispatcher: EventDispatcher;
-    hasIntlContext: boolean;
     pluginInjectionApi: ExtractInjectionAPI<typeof cardPlugin> | undefined;
     isNodeNested?: boolean;
 }

package/dist/types-ts4.5/ui/ConfigureOverlay/index.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="react" />
 import { jsx } from '@emotion/react';
 import { type EditorView } from '@atlaskit/editor-prosemirror/view';
-declare const OverlayWrapper: ({ view, targetElementPos, children, }: {
+declare const OverlayWrapper: ({ view, targetElementPos, children, isHoveredCallback: hoverCallback, }: {
     view: EditorView;
     targetElementPos: number | undefined;
     children: JSX.Element;
+    /** Fired when the mouse enters or leaves the overlay button */
+    isHoveredCallback: (isHovered: boolean) => void;
 }) => jsx.JSX.Element;
 export default OverlayWrapper;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "2.5.1",
+	"version": "2.6.0",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,10 +34,10 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/analytics-next": "^9.3.0",
-		"@atlaskit/button": "^18.3.0",
+		"@atlaskit/button": "^18.4.0",
 		"@atlaskit/custom-steps": "^0.4.0",
 		"@atlaskit/dropdown-menu": "^12.14.0",
-		"@atlaskit/editor-common": "^84.5.0",
+		"@atlaskit/editor-common": "^85.0.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
 		"@atlaskit/editor-plugin-decorations": "^1.1.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.1.0",
@@ -54,13 +54,13 @@
 		"@atlaskit/link-client-extension": "^1.9.0",
 		"@atlaskit/link-datasource": "^2.5.0",
 		"@atlaskit/linking-common": "^5.7.0",
-		"@atlaskit/linking-types": "^8.10.0",
-		"@atlaskit/menu": "2.7.4",
+		"@atlaskit/linking-types": "^8.11.0",
+		"@atlaskit/menu": "2.8.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^11.0.0",
 		"@atlaskit/smart-card": "^27.9.0",
 		"@atlaskit/theme": "^12.11.0",
-		"@atlaskit/tokens": "^1.53.0",
+		"@atlaskit/tokens": "^1.54.0",
 		"@atlaskit/tooltip": "^18.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",