@atlaskit/editor-plugin-card 4.5.0 → 4.5.1

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/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;

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

@@ -4,7 +4,6 @@
  */
 import React from 'react';
 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 { getPosHandler, ReactComponentProps } from '@atlaskit/editor-common/react-node-view';
@@ -25,10 +24,6 @@ export interface DatasourceProps extends ReactComponentProps {
 interface DatasourceComponentProps extends ReactComponentProps, Pick<DatasourceProps, 'node' | 'view' | 'getPos'> {
 }
 export declare class DatasourceComponent extends React.PureComponent<DatasourceComponentProps> {
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
-    context: any;
     constructor(props: DatasourceComponentProps);
     private getDatasource;
     private getTableView;

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import type { RichMediaLayout } from '@atlaskit/adf-schema';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
@@ -16,10 +15,6 @@ export declare class EmbedCardComponent extends React.PureComponent<SmartCardPro
     private scrollContainer?;
     private embedIframeRef;
     constructor(props: SmartCardProps);
-    context: any;
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
     state: EmbedCardState;
     private getPosSafely;
     onResolve: (data: {

package/dist/types/ui/DatasourceAppearanceButton.d.ts

@@ -3,7 +3,7 @@ import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { CardContext } from '@atlaskit/link-provider';
+import { type CardContext } from '@atlaskit/link-provider';
 export interface DatasourceAppearanceButtonProps {
     intl: IntlShape;
     editorAnalyticsApi?: EditorAnalyticsAPI;

package/dist/types/ui/DatasourceModal/ModalWithState.d.ts

@@ -5,10 +5,11 @@ import type { ConfigModalProps } from '@atlaskit/link-datasource';
 import type { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common';
 import type { DatasourceParameters } from '@atlaskit/linking-types';
 import type { cardPlugin } from '../../plugin';
-declare const ModalWithState: ({ api, editorView, }: {
+type ModalWithStateProps = {
     api: ExtractInjectionAPI<typeof cardPlugin> | undefined;
     editorView: EditorView;
-}) => JSX.Element | null;
+};
+declare const SafeModalWithState: React.MemoExoticComponent<({ api, editorView }: ModalWithStateProps) => JSX.Element>;
 export type ModalTypeToComponentMap = {
     componentType: React.ComponentType<ConfigModalProps<InlineCardAdf | DatasourceAdf, DatasourceParameters>>;
     datasourceId: string;
@@ -16,4 +17,4 @@ export type ModalTypeToComponentMap = {
 export declare const modalTypeToComponentMap: {
     [key in DatasourceModalType]: ModalTypeToComponentMap;
 };
-export default ModalWithState;
+export default SafeModalWithState;

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

@@ -1,10 +1,5 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import type { AnalyticsBindingsProps } from './common';
 export declare class EditorLinkingPlatformAnalytics extends React.PureComponent<AnalyticsBindingsProps> {
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
-    context: any;
-    render(): JSX.Element | null;
+    render(): JSX.Element;
 }

package/dist/types/ui/LinkToolbarAppearance.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { CardAppearance } from '@atlaskit/editor-common/provider-factory';
@@ -19,10 +18,6 @@ export interface LinkToolbarAppearanceProps {
     isDatasourceView?: boolean;
 }
 export declare class LinkToolbarAppearance extends React.Component<LinkToolbarAppearanceProps, {}> {
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
-    context: any;
     renderDropdown: (view?: EditorView, cardContext?: CardContext) => JSX.Element | null;
-    render(): JSX.Element | null;
+    render(): JSX.Element;
 }

package/dist/types/ui/WithCardContext.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { useSmartCardContext } from '@atlaskit/link-provider';
+export declare const WithCardContext: ({ children, }: {
+    children: (cardContext: ReturnType<typeof useSmartCardContext>) => React.ReactNode;
+}) => JSX.Element;

package/dist/types-ts4.5/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;

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

@@ -4,7 +4,6 @@
  */
 import React from 'react';
 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 { getPosHandler, ReactComponentProps } from '@atlaskit/editor-common/react-node-view';
@@ -25,10 +24,6 @@ export interface DatasourceProps extends ReactComponentProps {
 interface DatasourceComponentProps extends ReactComponentProps, Pick<DatasourceProps, 'node' | 'view' | 'getPos'> {
 }
 export declare class DatasourceComponent extends React.PureComponent<DatasourceComponentProps> {
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
-    context: any;
     constructor(props: DatasourceComponentProps);
     private getDatasource;
     private getTableView;

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import type { RichMediaLayout } from '@atlaskit/adf-schema';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
@@ -16,10 +15,6 @@ export declare class EmbedCardComponent extends React.PureComponent<SmartCardPro
     private scrollContainer?;
     private embedIframeRef;
     constructor(props: SmartCardProps);
-    context: any;
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
     state: EmbedCardState;
     private getPosSafely;
     onResolve: (data: {

package/dist/types-ts4.5/ui/DatasourceAppearanceButton.d.ts

@@ -3,7 +3,7 @@ import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { CardContext } from '@atlaskit/link-provider';
+import { type CardContext } from '@atlaskit/link-provider';
 export interface DatasourceAppearanceButtonProps {
     intl: IntlShape;
     editorAnalyticsApi?: EditorAnalyticsAPI;

package/dist/types-ts4.5/ui/DatasourceModal/ModalWithState.d.ts

@@ -5,10 +5,11 @@ import type { ConfigModalProps } from '@atlaskit/link-datasource';
 import type { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common';
 import type { DatasourceParameters } from '@atlaskit/linking-types';
 import type { cardPlugin } from '../../plugin';
-declare const ModalWithState: ({ api, editorView, }: {
+type ModalWithStateProps = {
     api: ExtractInjectionAPI<typeof cardPlugin> | undefined;
     editorView: EditorView;
-}) => JSX.Element | null;
+};
+declare const SafeModalWithState: React.MemoExoticComponent<({ api, editorView }: ModalWithStateProps) => JSX.Element>;
 export type ModalTypeToComponentMap = {
     componentType: React.ComponentType<ConfigModalProps<InlineCardAdf | DatasourceAdf, DatasourceParameters>>;
     datasourceId: string;
@@ -16,4 +17,4 @@ export type ModalTypeToComponentMap = {
 export declare const modalTypeToComponentMap: {
     [key in DatasourceModalType]: ModalTypeToComponentMap;
 };
-export default ModalWithState;
+export default SafeModalWithState;

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

@@ -1,10 +1,5 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import type { AnalyticsBindingsProps } from './common';
 export declare class EditorLinkingPlatformAnalytics extends React.PureComponent<AnalyticsBindingsProps> {
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
-    context: any;
-    render(): JSX.Element | null;
+    render(): JSX.Element;
 }

package/dist/types-ts4.5/ui/LinkToolbarAppearance.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { CardAppearance } from '@atlaskit/editor-common/provider-factory';
@@ -19,10 +18,6 @@ export interface LinkToolbarAppearanceProps {
     isDatasourceView?: boolean;
 }
 export declare class LinkToolbarAppearance extends React.Component<LinkToolbarAppearanceProps, {}> {
-    static contextTypes: {
-        contextAdapter: PropTypes.Requireable<object>;
-    };
-    context: any;
     renderDropdown: (view?: EditorView, cardContext?: CardContext) => JSX.Element | null;
-    render(): JSX.Element | null;
+    render(): JSX.Element;
 }

package/dist/types-ts4.5/ui/WithCardContext.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { useSmartCardContext } from '@atlaskit/link-provider';
+export declare const WithCardContext: ({ children, }: {
+    children: (cardContext: ReturnType<typeof useSmartCardContext>) => React.ReactNode;
+}) => JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "4.5.0",
+	"version": "4.5.1",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",