@atlaskit/editor-plugin-card 4.4.13 → 4.5.1

package/dist/cjs/ui/ToolbarViewedEvent.js

@@ -9,8 +9,8 @@ exports.ToolbarViewedEvent = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _useAnalyticsEvents2 = require("@atlaskit/analytics-next/useAnalyticsEvents");
+var _linkProvider = require("@atlaskit/link-provider");
 var _utils = require("../utils");
-var _CardContextProvider = require("./CardContextProvider");
 var _EditorAnalyticsContext = require("./EditorAnalyticsContext");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -47,14 +47,12 @@ var ToolbarViewedEvent = exports.ToolbarViewedEvent = function ToolbarViewedEven
   var url = _ref2.url,
     display = _ref2.display,
     editorView = _ref2.editorView;
+  var cardContext = (0, _linkProvider.useSmartLinkContext)();
   return /*#__PURE__*/_react.default.createElement(_EditorAnalyticsContext.EditorAnalyticsContext, {
     editorView: editorView
-  }, /*#__PURE__*/_react.default.createElement(_CardContextProvider.CardContextProvider, null, function (_ref3) {
-    var cardContext = _ref3.cardContext;
-    return url ? /*#__PURE__*/_react.default.createElement(ToolbarViewedEventBase, {
-      url: url,
-      display: display,
-      cardContext: cardContext
-    }) : null;
-  }));
+  }, url ? /*#__PURE__*/_react.default.createElement(ToolbarViewedEventBase, {
+    url: url,
+    display: display,
+    cardContext: cardContext
+  }) : null);
 };

package/dist/cjs/ui/WithCardContext.js

@@ -0,0 +1,14 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.WithCardContext = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _linkProvider = require("@atlaskit/link-provider");
+var WithCardContext = exports.WithCardContext = function WithCardContext(_ref) {
+  var children = _ref.children;
+  var cardContext = (0, _linkProvider.useSmartCardContext)();
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children(cardContext));
+};

package/dist/es2019/nodeviews/blockCard.js

@@ -1,6 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, UnsupportedBlock } from '@atlaskit/editor-common/ui';
@@ -94,9 +93,6 @@ export class BlockCardComponent extends React.PureComponent {
     }, cardInner) : data ? cardInner : null);
   }
 }
-_defineProperty(BlockCardComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 const WrappedBlockCard = Card(BlockCardComponent, UnsupportedBlock);
 export class BlockCard extends ReactNodeView {
   constructor(...args) {

package/dist/es2019/nodeviews/datasource.js

@@ -7,12 +7,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';
@@ -29,8 +29,6 @@ const getPosSafely = pos => {
 };
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class DatasourceComponent extends React.PureComponent {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   constructor(props) {
     super(props);
     _defineProperty(this, "getDatasource", () => this.props.node.attrs.datasource);
@@ -148,7 +146,6 @@ export class DatasourceComponent extends React.PureComponent {
     };
   }
   render() {
-    const cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
     const datasource = this.getDatasource();
     const attrs = this.props.node.attrs;
     const tableView = this.getTableView();
@@ -158,32 +155,23 @@ export class DatasourceComponent extends React.PureComponent {
         columnCustomSizes,
         wrappedColumnKeys
       } = this.getColumnsInfo();
-
-      // [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;
   }
 }
-_defineProperty(DatasourceComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 export class Datasource extends ReactNodeView {
   constructor(props) {
     var _props$pluginInjectio, _props$pluginInjectio2, _sharedState$currentS;

package/dist/es2019/nodeviews/embedCard.js

@@ -1,7 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
 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';
@@ -143,8 +142,9 @@ export class EmbedCardComponent extends React.PureComponent {
         })(view.state.tr));
       })();
       try {
-        const cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
-        const hasPreview = cardContext && cardContext.value.extractors.getPreview(url, 'web');
+        var _this$props$cardConte, _this$props$cardConte2;
+        const 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;
+        const hasPreview = url && cardContext && cardContext.extractors.getPreview(url, 'web');
         if (!hasPreview) {
           this.setState({
             hasPreview: false
@@ -240,13 +240,9 @@ export class EmbedCardComponent extends React.PureComponent {
     });
     this.scrollContainer = findOverflowScrollParent(props.view.dom) || undefined;
   }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   render() {
     const {
       node,
-      cardContext,
       allowResizing,
       fullWidthMode,
       view,
@@ -298,7 +294,7 @@ export class EmbedCardComponent extends React.PureComponent {
       embedIframeRef: this.embedIframeRef,
       actionOptions: actionOptions
     });
-    const cardInner = /*#__PURE__*/React.createElement(EmbedResizeMessageListener, {
+    return /*#__PURE__*/React.createElement(EmbedResizeMessageListener, {
       embedIframeRef: this.embedIframeRef,
       onHeightUpdate: this.onHeightUpdate
     }, /*#__PURE__*/React.createElement(CardInner, {
@@ -317,16 +313,8 @@ export class EmbedCardComponent extends 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);
   }
 }
-_defineProperty(EmbedCardComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 const WrappedBlockCard = Card(EmbedCardComponent, UnsupportedBlock);
 export class EmbedCard extends ReactNodeView {
   constructor(...args) {

package/dist/es2019/nodeviews/genericCard.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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';
@@ -9,6 +8,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';
 const WithClickHandler = ({
   pluginInjectionApi,
@@ -52,8 +52,7 @@ const WithClickHandler = ({
   }));
 };
 export function Card(SmartCardComponent, UnsupportedComponent) {
-  var _class;
-  return _class = class extends React.Component {
+  return class extends React.Component {
     constructor(...args) {
       super(...args);
       _defineProperty(this, "state", {
@@ -84,7 +83,6 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
           return /*#__PURE__*/React.createElement(UnsupportedComponent, null);
         }
       }
-      const cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
       const editorAppearance = (_getPluginState = getPluginState(this.props.view.state)) === null || _getPluginState === void 0 ? void 0 : _getPluginState.editorAppearance;
       const analyticsEditorAppearance = getAnalyticsEditorAppearance(editorAppearance);
       return /*#__PURE__*/React.createElement(AnalyticsContext, {
@@ -102,12 +100,12 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
         __livePage: this.props.__livePage
       }, ({
         onClick
-      }) => /*#__PURE__*/React.createElement(SmartCardComponent, _extends({
+      }) => /*#__PURE__*/React.createElement(WithCardContext, null, cardContext => /*#__PURE__*/React.createElement(SmartCardComponent, _extends({
         key: url,
         cardContext: cardContext
       }, this.props, {
         onClick: onClick
-      }))));
+      })))));
     }
     componentDidCatch(error) {
       const maybeAPIError = error;
@@ -142,7 +140,5 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
         });
       }
     }
-  }, _defineProperty(_class, "contextTypes", {
-    contextAdapter: PropTypes.object
-  }), _class;
+  };
 }

package/dist/es2019/plugin.js

@@ -18,6 +18,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 const cardPlugin = ({
   config: options = {},
   api

package/dist/es2019/toolbar.js

@@ -3,15 +3,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';
@@ -177,7 +179,7 @@ const getToolbarViewedItem = (url, display) => {
   }];
 };
 const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkPicker, linkPicker, pluginInjectionApi) => node => {
-  var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _node$attrs, _node$attrs$datasourc;
+  var _pluginInjectionApi$a, _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$a2, _node$attrs, _node$attrs$datasourc;
   const {
     url
   } = titleUrlPairFromNode(node);
@@ -202,6 +204,19 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
   } = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {};
   const isDatasource = isDatasourceNode(node);
   const pluginState = pluginKey.getState(state);
+  const annotationApiState = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.annotation) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.sharedState.currentState();
+  const activeCommentMark = node.marks.find(mark => mark.type.name === 'annotation' && (annotationApiState === null || annotationApiState === void 0 ? void 0 : annotationApiState.annotations[mark.attrs.id]) === false);
+  const isCommentEnabled = annotationApiState && annotationApiState.isVisible && !annotationApiState.bookmark && !annotationApiState.mouseData.isSelecting && !activeCommentMark && node.type === state.schema.nodes.inlineCard && fg('platform_inline_node_as_valid_annotation_selection');
+  const onCommentButtonClick = (state, dispatch) => {
+    if (!(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.annotation) || !isCommentEnabled) {
+      return false;
+    }
+    const {
+      setInlineCommentDraftState
+    } = pluginInjectionApi.annotation.actions;
+    const command = setInlineCommentDraftState(true, INPUT_METHOD.FLOATING_TB);
+    return command(state, dispatch);
+  };
   const shouldRenderDatasourceToolbar = isDatasource && cardOptions.allowDatasource && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : (_node$attrs$datasourc = _node$attrs.datasource) === null || _node$attrs$datasourc === void 0 ? void 0 : _node$attrs$datasourc.id);
   if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar) {
     return [buildEditLinkToolbar({
@@ -241,7 +256,18 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
     }, {
       type: 'separator'
     }];
-    const toolbarItems = [...editItems, {
+    const 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'
+    }] : [];
+    const toolbarItems = [...editItems, ...commentItems, {
       id: 'editor.link.openLink',
       type: 'button',
       icon: LinkExternalIcon,
@@ -279,8 +305,8 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
     }];
     if (currentAppearance === 'embed') {
-      var _pluginInjectionApi$a2;
-      const alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions, cardOptions);
+      var _pluginInjectionApi$a3;
+      const alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 ? 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/es2019/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';
 const buttonStyles = css({
@@ -108,9 +108,8 @@ export const DatasourceAppearanceButton = ({
   selected,
   inputMethod
 }) => {
-  return jsx(CardContextProvider, null, ({
-    cardContext
-  }) => jsx(DatasourceAppearanceButtonWithCardContext, {
+  const cardContext = useSmartLinkContext();
+  return jsx(DatasourceAppearanceButtonWithCardContext, {
     url: url,
     intl: intl,
     editorAnalyticsApi: editorAnalyticsApi,
@@ -119,5 +118,5 @@ export const DatasourceAppearanceButton = ({
     cardContext: cardContext,
     selected: selected,
     inputMethod: inputMethod
-  }));
+  });
 };

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

@@ -1,13 +1,14 @@
 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';
 const ModalWithState = ({
   api,
   editorView
 }) => {
+  const cardContext = useSmartLinkContext();
   const {
     cardState
   } = useSharedPluginState(api, ['card']);
@@ -28,15 +29,22 @@ const ModalWithState = ({
   return /*#__PURE__*/React.createElement(DatasourceErrorBoundary, {
     view: editorView,
     datasourceModalType: datasourceModalType
-  }, /*#__PURE__*/React.createElement(CardContextProvider, null, ({
-    cardContext
-  }) => /*#__PURE__*/React.createElement(DatasourceModal, {
+  }, /*#__PURE__*/React.createElement(DatasourceModal, {
     view: editorView,
     cardContext: cardContext,
     datasourceId: datasourceId,
     componentType: componentType
-  })));
+  }));
 };
+const SafeModalWithState = /*#__PURE__*/React.memo(({
+  api,
+  editorView
+}) => {
+  return /*#__PURE__*/React.createElement(EditorSmartCardProviderValueGuard, null, /*#__PURE__*/React.createElement(ModalWithState, {
+    api: api,
+    editorView: editorView
+  }));
+});
 export const modalTypeToComponentMap = {
   jira: {
     componentType: JiraIssuesConfigModal,
@@ -51,4 +59,4 @@ export const modalTypeToComponentMap = {
     datasourceId: ASSETS_LIST_OF_LINKS_DATASOURCE_ID
   }
 };
-export default ModalWithState;
+export default SafeModalWithState;

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

@@ -11,10 +11,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';
@@ -241,35 +241,11 @@ export const EditToolbarButton = props => {
     onLinkEditClick,
     url
   } = props;
-  return jsx(CardContextProvider, null, ({
-    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, {
+  const cardContext = useSmartLinkContext();
+  if (props.url) {
+    return jsx(EditToolbarButtonWithUrl, {
       datasourceId: datasourceId,
-      url: url,
+      url: props.url,
       intl: intl,
       editorAnalyticsApi: editorAnalyticsApi,
       editorView: editorView,
@@ -277,5 +253,26 @@ export const 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/es2019/ui/EditorLinkingPlatformAnalytics/index.js

@@ -1,33 +1,14 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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';
 
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class EditorLinkingPlatformAnalytics extends React.PureComponent {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   render() {
-    var _this$context, _this$context$context;
-    const cardContext = (_this$context = this.context) === null || _this$context === void 0 ? void 0 : (_this$context$context = _this$context.contextAdapter) === null || _this$context$context === void 0 ? void 0 : _this$context$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, {
+    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))));
   }
-}
-_defineProperty(EditorLinkingPlatformAnalytics, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
+}

package/dist/es2019/ui/LinkToolbarAppearance.js

@@ -1,6 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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';
@@ -12,7 +11,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 class LinkToolbarAppearance extends React.Component {
   constructor(...args) {
     super(...args);
@@ -114,16 +115,12 @@ export class LinkToolbarAppearance extends React.Component {
     });
   }
   render() {
-    const cardContext = this.context.contextAdapter ? this.context.contextAdapter.card : undefined;
     const {
       editorView
     } = this.props;
-    return this.renderDropdown(editorView, cardContext && cardContext.value);
+    return /*#__PURE__*/React.createElement(WithCardContext, null, cardContext => this.renderDropdown(editorView, cardContext && cardContext.value));
   }
 }
-_defineProperty(LinkToolbarAppearance, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 const getUnavailableMessage = (state, intl) => {
   try {
     const parentNode = state.selection.$from.node(1);

package/dist/es2019/ui/ToolbarViewedEvent.js

@@ -1,7 +1,7 @@
 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
@@ -38,13 +38,12 @@ export const ToolbarViewedEvent = ({
   display,
   editorView
 }) => {
+  const cardContext = useSmartLinkContext();
   return /*#__PURE__*/React.createElement(EditorAnalyticsContext, {
     editorView: editorView
-  }, /*#__PURE__*/React.createElement(CardContextProvider, null, ({
-    cardContext
-  }) => url ? /*#__PURE__*/React.createElement(ToolbarViewedEventBase, {
+  }, url ? /*#__PURE__*/React.createElement(ToolbarViewedEventBase, {
     url: url,
     display: display,
     cardContext: cardContext
-  }) : null));
+  }) : null);
 };

package/dist/es2019/ui/WithCardContext.js

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

package/dist/esm/nodeviews/blockCard.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 from 'react';
-import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { findOverflowScrollParent, UnsupportedBlock } from '@atlaskit/editor-common/ui';
@@ -106,9 +105,6 @@ export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
   }]);
   return BlockCardComponent;
 }(React.PureComponent);
-_defineProperty(BlockCardComponent, "contextTypes", {
-  contextAdapter: PropTypes.object
-});
 var WrappedBlockCard = Card(BlockCardComponent, UnsupportedBlock);
 export var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(BlockCard, _ReactNodeView);