@atlaskit/editor-plugin-card 4.4.13 → 4.5.1

package/dist/esm/nodeviews/datasource.js

@@ -19,12 +19,12 @@ import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import PropTypes from 'prop-types';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { DATASOURCE_INNER_CONTAINER_CLASSNAME, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { calcBreakoutWidth } from '@atlaskit/editor-common/utils';
 import { DatasourceTableView } from '@atlaskit/link-datasource';
+import { EditorSmartCardProvider, EditorSmartCardProviderValueGuard } from '@atlaskit/link-provider';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { DatasourceErrorBoundary } from '../datasourceErrorBoundary';
@@ -43,8 +43,6 @@ var getPosSafely = function getPosSafely(pos) {
 export var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(DatasourceComponent, _React$PureComponent);
   var _super = _createSuper(DatasourceComponent);
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   function DatasourceComponent(props) {
     var _this;
     _classCallCheck(this, DatasourceComponent);
@@ -180,7 +178,6 @@ export var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
   }, {
     key: "render",
     value: function render() {
-      var cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
       var datasource = this.getDatasource();
       var attrs = this.props.node.attrs;
       var tableView = this.getTableView();
@@ -189,34 +186,25 @@ export var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
           visibleColumnKeys = _this$getColumnsInfo10.visibleColumnKeys,
           columnCustomSizes = _this$getColumnsInfo10.columnCustomSizes,
           wrappedColumnKeys = _this$getColumnsInfo10.wrappedColumnKeys;
-
-        // [WS-2307]: we only render card wrapped into a Provider when the value is ready
-        if (cardContext && cardContext.value) {
-          return jsx(EditorAnalyticsContext, {
-            editorView: this.props.view
-          }, jsx(cardContext.Provider, {
-            value: cardContext.value
-          }, jsx(DatasourceTableView, {
-            datasourceId: datasource.id,
-            parameters: datasource.parameters,
-            visibleColumnKeys: visibleColumnKeys,
-            onVisibleColumnKeysChange: this.handleColumnChange,
-            url: attrs === null || attrs === void 0 ? void 0 : attrs.url,
-            onColumnResize: this.handleColumnResize,
-            columnCustomSizes: columnCustomSizes,
-            onWrappedColumnChange: this.handleWrappedColumnChange,
-            wrappedColumnKeys: wrappedColumnKeys
-          })));
-        }
+        return jsx(EditorSmartCardProviderValueGuard, null, jsx(EditorAnalyticsContext, {
+          editorView: this.props.view
+        }, jsx(EditorSmartCardProvider, null, jsx(DatasourceTableView, {
+          datasourceId: datasource.id,
+          parameters: datasource.parameters,
+          visibleColumnKeys: visibleColumnKeys,
+          onVisibleColumnKeysChange: this.handleColumnChange,
+          url: attrs === null || attrs === void 0 ? void 0 : attrs.url,
+          onColumnResize: this.handleColumnResize,
+          columnCustomSizes: columnCustomSizes,
+          onWrappedColumnChange: this.handleWrappedColumnChange,
+          wrappedColumnKeys: wrappedColumnKeys
+        }))));
       }
       return null;
     }
   }]);
   return DatasourceComponent;
 }(React.PureComponent);
-_defineProperty(DatasourceComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 export var Datasource = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(Datasource, _ReactNodeView);
   var _super2 = _createSuper(Datasource);

package/dist/esm/nodeviews/embedCard.js

@@ -12,7 +12,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
-import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
@@ -149,8 +148,9 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         })(view.state.tr));
       })();
       try {
-        var cardContext = _this.context.contextAdapter ? _this.context.contextAdapter.card : undefined;
-        var hasPreview = cardContext && cardContext.value.extractors.getPreview(url, 'web');
+        var _this$props$cardConte, _this$props$cardConte2;
+        var cardContext = (_this$props$cardConte = _this.props.cardContext) !== null && _this$props$cardConte !== void 0 && _this$props$cardConte.value ? (_this$props$cardConte2 = _this.props.cardContext) === null || _this$props$cardConte2 === void 0 ? void 0 : _this$props$cardConte2.value : undefined;
+        var hasPreview = url && cardContext && cardContext.extractors.getPreview(url, 'web');
         if (!hasPreview) {
           _this.setState({
             hasPreview: false
@@ -242,14 +242,11 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
     _this.scrollContainer = findOverflowScrollParent(props.view.dom) || undefined;
     return _this;
   }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   _createClass(EmbedCardComponent, [{
     key: "render",
     value: function render() {
       var _this$props = this.props,
         node = _this$props.node,
-        cardContext = _this$props.cardContext,
         allowResizing = _this$props.allowResizing,
         fullWidthMode = _this$props.fullWidthMode,
         view = _this$props.view,
@@ -298,7 +295,7 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         embedIframeRef: this.embedIframeRef,
         actionOptions: actionOptions
       });
-      var cardInner = /*#__PURE__*/React.createElement(EmbedResizeMessageListener, {
+      return /*#__PURE__*/React.createElement(EmbedResizeMessageListener, {
         embedIframeRef: this.embedIframeRef,
         onHeightUpdate: this.onHeightUpdate
       }, /*#__PURE__*/React.createElement(CardInner, {
@@ -317,18 +314,10 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         cardProps: cardProps,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent
       }));
-
-      // [WS-2307]: we only render card wrapped into a Provider when the value is ready
-      return /*#__PURE__*/React.createElement(React.Fragment, null, cardContext && cardContext.value ? /*#__PURE__*/React.createElement(cardContext.Provider, {
-        value: cardContext.value
-      }, cardInner) : null);
     }
   }]);
   return EmbedCardComponent;
 }(React.PureComponent);
-_defineProperty(EmbedCardComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 var WrappedBlockCard = Card(EmbedCardComponent, UnsupportedBlock);
 export var EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(EmbedCard, _ReactNodeView);

package/dist/esm/nodeviews/genericCard.js

@@ -9,7 +9,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React, { useCallback } from 'react';
-import PropTypes from 'prop-types';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
@@ -17,6 +16,7 @@ import { getAnalyticsEditorAppearance } from '@atlaskit/editor-common/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { changeSelectedCardToLinkFallback } from '../pm-plugins/doc';
 import { getPluginState } from '../pm-plugins/util/state';
+import { WithCardContext } from '../ui/WithCardContext';
 import { titleUrlPairFromNode } from '../utils';
 var WithClickHandler = function WithClickHandler(_ref) {
   var pluginInjectionApi = _ref.pluginInjectionApi,
@@ -58,13 +58,12 @@ var WithClickHandler = function WithClickHandler(_ref) {
   }));
 };
 export function Card(SmartCardComponent, UnsupportedComponent) {
-  var _class;
-  return _class = /*#__PURE__*/function (_React$Component) {
-    _inherits(_class, _React$Component);
-    var _super = _createSuper(_class);
-    function _class() {
+  return /*#__PURE__*/function (_React$Component) {
+    _inherits(_class2, _React$Component);
+    var _super = _createSuper(_class2);
+    function _class2() {
       var _this;
-      _classCallCheck(this, _class);
+      _classCallCheck(this, _class2);
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
@@ -74,7 +73,7 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
       });
       return _this;
     }
-    _createClass(_class, [{
+    _createClass(_class2, [{
       key: "render",
       value: function render() {
         var _getPluginState,
@@ -99,7 +98,6 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
             return /*#__PURE__*/React.createElement(UnsupportedComponent, null);
           }
         }
-        var cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
         var editorAppearance = (_getPluginState = getPluginState(this.props.view.state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.editorAppearance;
         var analyticsEditorAppearance = getAnalyticsEditorAppearance(editorAppearance);
         return /*#__PURE__*/React.createElement(AnalyticsContext, {
@@ -117,12 +115,14 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
           __livePage: this.props.__livePage
         }, function (_ref2) {
           var onClick = _ref2.onClick;
-          return /*#__PURE__*/React.createElement(SmartCardComponent, _extends({
-            key: url,
-            cardContext: cardContext
-          }, _this2.props, {
-            onClick: onClick
-          }));
+          return /*#__PURE__*/React.createElement(WithCardContext, null, function (cardContext) {
+            return /*#__PURE__*/React.createElement(SmartCardComponent, _extends({
+              key: url,
+              cardContext: cardContext
+            }, _this2.props, {
+              onClick: onClick
+            }));
+          });
         }));
       }
     }, {
@@ -159,8 +159,6 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
         }
       }
     }]);
-    return _class;
-  }(React.Component), _defineProperty(_class, "contextTypes", {
-    contextAdapter: PropTypes.object
-  }), _class;
+    return _class2;
+  }(React.Component);
 }

package/dist/esm/plugin.js

@@ -23,6 +23,11 @@ import { EditorLinkingPlatformAnalytics } from './ui/EditorLinkingPlatformAnalyt
 import { EditorSmartCardEvents } from './ui/EditorSmartCardEvents';
 import LayoutButton from './ui/LayoutButton';
 import { isDatasourceConfigEditable } from './utils';
+
+// Dummpy type of AnnotationPlugin
+// This is used to avoid editor universal preset's inferred type maximum length error
+// TODO: Remove this when the issue is fixed
+
 export var cardPlugin = function cardPlugin(_ref) {
   var _options$lpLinkPicker;
   var _ref$config = _ref.config,

package/dist/esm/toolbar.js

@@ -7,15 +7,17 @@ import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, buildOpenedSettingsPayload, buildVisitedLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { buildLayoutButtons, commandWithMetadata } from '@atlaskit/editor-common/card';
 import { getLinkPreferencesURLFromENV } from '@atlaskit/editor-common/link';
-import commonMessages, { linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
+import commonMessages, { annotationMessages, linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, richMediaClassName } from '@atlaskit/editor-common/styles';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
+import CommentIcon from '@atlaskit/icon/core/comment';
 import DeleteIcon from '@atlaskit/icon/core/delete';
 import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
 import LinkExternalIcon from '@atlaskit/icon/core/link-external';
 import SettingsIcon from '@atlaskit/icon/core/settings';
+import LegacyCommentIcon from '@atlaskit/icon/glyph/comment';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
@@ -179,7 +181,7 @@ var getToolbarViewedItem = function getToolbarViewedItem(url, display) {
 };
 var generateToolbarItems = function generateToolbarItems(state, intl, providerFactory, cardOptions, lpLinkPicker, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs;
+    var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$a2, _node$attrs;
     var _titleUrlPairFromNode2 = titleUrlPairFromNode(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$a = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.analytics) !== null && _pluginInjectionApi$a !== void 0 ? _pluginInjectionApi$a : {},
@@ -200,6 +202,19 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       hoverDecoration = _ref2.hoverDecoration;
     var isDatasource = isDatasourceNode(node);
     var pluginState = pluginKey.getState(state);
+    var annotationApiState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.annotation) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.sharedState.currentState();
+    var activeCommentMark = node.marks.find(function (mark) {
+      return mark.type.name === 'annotation' && (annotationApiState === null || annotationApiState === void 0 ? void 0 : annotationApiState.annotations[mark.attrs.id]) === false;
+    });
+    var isCommentEnabled = annotationApiState && annotationApiState.isVisible && !annotationApiState.bookmark && !annotationApiState.mouseData.isSelecting && !activeCommentMark && node.type === state.schema.nodes.inlineCard && fg('platform_inline_node_as_valid_annotation_selection');
+    var onCommentButtonClick = function onCommentButtonClick(state, dispatch) {
+      if (!(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.annotation) || !isCommentEnabled) {
+        return false;
+      }
+      var setInlineCommentDraftState = pluginInjectionApi.annotation.actions.setInlineCommentDraftState;
+      var command = setInlineCommentDraftState(true, INPUT_METHOD.FLOATING_TB);
+      return command(state, dispatch);
+    };
     var shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && canRenderDatasource(node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 || (_node$attrs = _node$attrs.datasource) === null || _node$attrs === void 0 ? void 0 : _node$attrs.id);
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
       return [buildEditLinkToolbar({
@@ -239,7 +254,18 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       }, {
         type: 'separator'
       }];
-      var toolbarItems = [].concat(editItems, [{
+      var commentItems = isCommentEnabled ? [{
+        id: 'editor.link.commentLink',
+        type: 'button',
+        icon: CommentIcon,
+        testId: 'inline-card-toolbar-comment-button',
+        iconFallback: LegacyCommentIcon,
+        title: intl.formatMessage(annotationMessages.createComment),
+        onClick: onCommentButtonClick
+      }, {
+        type: 'separator'
+      }] : [];
+      var toolbarItems = [].concat(editItems, commentItems, [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: LinkExternalIcon,
@@ -277,8 +303,8 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
       }]);
       if (currentAppearance === 'embed') {
-        var _pluginInjectionApi$a2;
-        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions, cardOptions);
+        var _pluginInjectionApi$a3;
+        var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, cardOptions);
         if (alignmentOptions.length) {
           alignmentOptions.push({
             type: 'separator'

package/dist/esm/ui/DatasourceAppearanceButton.js

@@ -11,10 +11,10 @@ import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { buildDatasourceAdf } from '@atlaskit/link-datasource';
+import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { Flex } from '@atlaskit/primitives';
 import { updateCardViaDatasource } from '../pm-plugins/doc';
 import { pluginKey } from '../pm-plugins/plugin-key';
-import { CardContextProvider } from './CardContextProvider';
 import { DatasourceIcon } from './DatasourceIcon';
 import { useFetchDatasourceInfo } from './useFetchDatasourceInfo';
 var buttonStyles = css({
@@ -105,17 +105,15 @@ export var DatasourceAppearanceButton = function DatasourceAppearanceButton(_ref
     editorState = _ref2.editorState,
     selected = _ref2.selected,
     inputMethod = _ref2.inputMethod;
-  return jsx(CardContextProvider, null, function (_ref3) {
-    var cardContext = _ref3.cardContext;
-    return jsx(DatasourceAppearanceButtonWithCardContext, {
-      url: url,
-      intl: intl,
-      editorAnalyticsApi: editorAnalyticsApi,
-      editorView: editorView,
-      editorState: editorState,
-      cardContext: cardContext,
-      selected: selected,
-      inputMethod: inputMethod
-    });
+  var cardContext = useSmartLinkContext();
+  return jsx(DatasourceAppearanceButtonWithCardContext, {
+    url: url,
+    intl: intl,
+    editorAnalyticsApi: editorAnalyticsApi,
+    editorView: editorView,
+    editorState: editorState,
+    cardContext: cardContext,
+    selected: selected,
+    inputMethod: inputMethod
   });
 };

package/dist/esm/ui/DatasourceModal/ModalWithState.js

@@ -1,12 +1,13 @@
 import React from 'react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, AssetsConfigModal, CONFLUENCE_SEARCH_DATASOURCE_ID, ConfluenceSearchConfigModal, JIRA_LIST_OF_LINKS_DATASOURCE_ID, JiraIssuesConfigModal } from '@atlaskit/link-datasource';
+import { EditorSmartCardProviderValueGuard, useSmartLinkContext } from '@atlaskit/link-provider';
 import { DatasourceErrorBoundary } from '../../datasourceErrorBoundary';
-import { CardContextProvider } from '../CardContextProvider';
 import { DatasourceModal } from './index';
 var ModalWithState = function ModalWithState(_ref) {
   var api = _ref.api,
     editorView = _ref.editorView;
+  var cardContext = useSmartLinkContext();
   var _useSharedPluginState = useSharedPluginState(api, ['card']),
     cardState = _useSharedPluginState.cardState;
   if (!cardState) {
@@ -23,16 +24,21 @@ var ModalWithState = function ModalWithState(_ref) {
   return /*#__PURE__*/React.createElement(DatasourceErrorBoundary, {
     view: editorView,
     datasourceModalType: datasourceModalType
-  }, /*#__PURE__*/React.createElement(CardContextProvider, null, function (_ref2) {
-    var cardContext = _ref2.cardContext;
-    return /*#__PURE__*/React.createElement(DatasourceModal, {
-      view: editorView,
-      cardContext: cardContext,
-      datasourceId: datasourceId,
-      componentType: componentType
-    });
+  }, /*#__PURE__*/React.createElement(DatasourceModal, {
+    view: editorView,
+    cardContext: cardContext,
+    datasourceId: datasourceId,
+    componentType: componentType
   }));
 };
+var SafeModalWithState = /*#__PURE__*/React.memo(function (_ref2) {
+  var api = _ref2.api,
+    editorView = _ref2.editorView;
+  return /*#__PURE__*/React.createElement(EditorSmartCardProviderValueGuard, null, /*#__PURE__*/React.createElement(ModalWithState, {
+    api: api,
+    editorView: editorView
+  }));
+});
 export var modalTypeToComponentMap = {
   jira: {
     componentType: JiraIssuesConfigModal,
@@ -47,4 +53,4 @@ export var modalTypeToComponentMap = {
     datasourceId: ASSETS_LIST_OF_LINKS_DATASOURCE_ID
   }
 };
-export default ModalWithState;
+export default SafeModalWithState;

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

@@ -14,10 +14,10 @@ import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
+import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { ButtonItem } from '@atlaskit/menu';
 import { Flex } from '@atlaskit/primitives';
 import { focusEditorView, isDatasourceConfigEditable } from '../../utils';
-import { CardContextProvider } from '../CardContextProvider';
 import { editDatasource } from '../editDatasourceAction';
 import { useFetchDatasourceDataInfo } from '../useFetchDatasourceDataInfo';
 import { useFetchDatasourceInfo } from '../useFetchDatasourceInfo';
@@ -244,34 +244,11 @@ export var EditToolbarButton = function EditToolbarButton(props) {
     intl = props.intl,
     onLinkEditClick = props.onLinkEditClick,
     url = props.url;
-  return jsx(CardContextProvider, null, function (_ref) {
-    var cardContext = _ref.cardContext;
-    if (props.url) {
-      return jsx(EditToolbarButtonWithUrl, {
-        datasourceId: datasourceId,
-        url: props.url,
-        intl: intl,
-        editorAnalyticsApi: editorAnalyticsApi,
-        editorView: editorView,
-        cardContext: cardContext,
-        onLinkEditClick: onLinkEditClick,
-        currentAppearance: currentAppearance
-      });
-    }
-    if (props.datasourceId && props.node) {
-      return jsx(EditToolbarButtonWithDatasourceId, {
-        datasourceId: props.datasourceId,
-        node: props.node,
-        intl: intl,
-        editorAnalyticsApi: editorAnalyticsApi,
-        editorView: editorView,
-        onLinkEditClick: onLinkEditClick,
-        currentAppearance: currentAppearance
-      });
-    }
-    return jsx(EditToolbarButtonWithCardContext, {
+  var cardContext = useSmartLinkContext();
+  if (props.url) {
+    return jsx(EditToolbarButtonWithUrl, {
       datasourceId: datasourceId,
-      url: url,
+      url: props.url,
       intl: intl,
       editorAnalyticsApi: editorAnalyticsApi,
       editorView: editorView,
@@ -279,5 +256,26 @@ export var EditToolbarButton = function EditToolbarButton(props) {
       onLinkEditClick: onLinkEditClick,
       currentAppearance: currentAppearance
     });
+  }
+  if (props.datasourceId && props.node) {
+    return jsx(EditToolbarButtonWithDatasourceId, {
+      datasourceId: props.datasourceId,
+      node: props.node,
+      intl: intl,
+      editorAnalyticsApi: editorAnalyticsApi,
+      editorView: editorView,
+      onLinkEditClick: onLinkEditClick,
+      currentAppearance: currentAppearance
+    });
+  }
+  return jsx(EditToolbarButtonWithCardContext, {
+    datasourceId: datasourceId,
+    url: url,
+    intl: intl,
+    editorAnalyticsApi: editorAnalyticsApi,
+    editorView: editorView,
+    cardContext: cardContext,
+    onLinkEditClick: onLinkEditClick,
+    currentAppearance: currentAppearance
   });
 };

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

@@ -3,11 +3,10 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
-import PropTypes from 'prop-types';
+import { EditorSmartCardProvider, EditorSmartCardProviderValueGuard } from '@atlaskit/link-provider';
 import { EditorAnalyticsContext } from '../EditorAnalyticsContext';
 import { DatasourceEventsBinding } from './DatasourceEvents';
 import { LinkEventsBinding } from './LinkEvents';
@@ -22,30 +21,11 @@ export var EditorLinkingPlatformAnalytics = /*#__PURE__*/function (_React$PureCo
   }
   _createClass(EditorLinkingPlatformAnalytics, [{
     key: "render",
-    value:
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
-    function render() {
-      var _this$context;
-      var cardContext = (_this$context = this.context) === null || _this$context === void 0 || (_this$context = _this$context.contextAdapter) === null || _this$context === void 0 ? void 0 : _this$context.card;
-
-      /**
-       * The analytics hook needs to be able to communicate with the card context
-       * If we can't access it, don't mount the event bindings
-       * This effectively entirely disables all tracking behaviour
-       */
-      if (!(cardContext !== null && cardContext !== void 0 && cardContext.value)) {
-        return null;
-      }
-      return /*#__PURE__*/React.createElement(cardContext.Provider, {
-        value: cardContext.value
-      }, /*#__PURE__*/React.createElement(EditorAnalyticsContext, {
+    value: function render() {
+      return /*#__PURE__*/React.createElement(EditorSmartCardProvider, null, /*#__PURE__*/React.createElement(EditorSmartCardProviderValueGuard, null, /*#__PURE__*/React.createElement(EditorAnalyticsContext, {
         editorView: this.props.editorView
-      }, /*#__PURE__*/React.createElement(LinkEventsBinding, this.props), /*#__PURE__*/React.createElement(DatasourceEventsBinding, this.props)));
+      }, /*#__PURE__*/React.createElement(LinkEventsBinding, this.props), /*#__PURE__*/React.createElement(DatasourceEventsBinding, this.props))));
     }
   }]);
   return EditorLinkingPlatformAnalytics;
-}(React.PureComponent);
-_defineProperty(EditorLinkingPlatformAnalytics, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
+}(React.PureComponent);

package/dist/esm/ui/LinkToolbarAppearance.js

@@ -10,7 +10,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
-import PropTypes from 'prop-types';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { commandWithMetadata, getButtonGroupOption, LinkToolbarButtonGroup } from '@atlaskit/editor-common/card';
@@ -22,7 +21,9 @@ import { changeSelectedCardToLink, setSelectedCardAppearance } from '../pm-plugi
 import { shouldRenderToolbarPulse } from '../toolbar';
 import { getResolvedAttributesFromStore } from '../utils';
 import { DiscoveryPulse } from './Pulse';
+import { WithCardContext } from './WithCardContext';
 // eslint-disable-next-line @repo/internal/react/no-class-components
+
 export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
   _inherits(LinkToolbarAppearance, _React$Component);
   var _super = _createSuper(LinkToolbarAppearance);
@@ -136,16 +137,15 @@ export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
   _createClass(LinkToolbarAppearance, [{
     key: "render",
     value: function render() {
-      var cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
+      var _this2 = this;
       var editorView = this.props.editorView;
-      return this.renderDropdown(editorView, cardContext && cardContext.value);
+      return /*#__PURE__*/React.createElement(WithCardContext, null, function (cardContext) {
+        return _this2.renderDropdown(editorView, cardContext && cardContext.value);
+      });
     }
   }]);
   return LinkToolbarAppearance;
 }(React.Component);
-_defineProperty(LinkToolbarAppearance, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 var getUnavailableMessage = function getUnavailableMessage(state, intl) {
   try {
     var parentNode = state.selection.$from.node(1);

package/dist/esm/ui/ToolbarViewedEvent.js

@@ -3,8 +3,8 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React, { useEffect } from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
+import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { getResolvedAttributesFromStore } from '../utils';
-import { CardContextProvider } from './CardContextProvider';
 import { EditorAnalyticsContext } from './EditorAnalyticsContext';
 /**
  * Handles firing the toolbar viewed event
@@ -37,14 +37,12 @@ export var ToolbarViewedEvent = function ToolbarViewedEvent(_ref2) {
   var url = _ref2.url,
     display = _ref2.display,
     editorView = _ref2.editorView;
+  var cardContext = useSmartLinkContext();
   return /*#__PURE__*/React.createElement(EditorAnalyticsContext, {
     editorView: editorView
-  }, /*#__PURE__*/React.createElement(CardContextProvider, null, function (_ref3) {
-    var cardContext = _ref3.cardContext;
-    return url ? /*#__PURE__*/React.createElement(ToolbarViewedEventBase, {
-      url: url,
-      display: display,
-      cardContext: cardContext
-    }) : null;
-  }));
+  }, url ? /*#__PURE__*/React.createElement(ToolbarViewedEventBase, {
+    url: url,
+    display: display,
+    cardContext: cardContext
+  }) : null);
 };

package/dist/esm/ui/WithCardContext.js

@@ -0,0 +1,7 @@
+import React from 'react';
+import { useSmartCardContext } from '@atlaskit/link-provider';
+export var WithCardContext = function WithCardContext(_ref) {
+  var children = _ref.children;
+  var cardContext = useSmartCardContext();
+  return /*#__PURE__*/React.createElement(React.Fragment, null, children(cardContext));
+};

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import ReactNodeView, { type getInlineNodeViewProducer } from '@atlaskit/editor-common/react-node-view';
 import type { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
@@ -8,9 +7,6 @@ import { Datasource } from '../nodeviews/datasource';
 import type { SmartCardProps } from './genericCard';
 export declare class BlockCardComponent extends React.PureComponent<SmartCardProps> {
     private scrollContainer?;
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
     constructor(props: SmartCardProps);
     onResolve: (data: {
         url?: string | undefined;