@atlaskit/editor-plugin-card 4.5.0 → 4.5.2

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,7 +16,8 @@ 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 { titleUrlPairFromNode } from '../utils';
+import { titleUrlPairFromNode } from '../pm-plugins/utils';
+import { WithCardContext } from '../ui/WithCardContext';
 var WithClickHandler = function WithClickHandler(_ref) {
   var pluginInjectionApi = _ref.pluginInjectionApi,
     url = _ref.url,
@@ -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/nodeviews/inlineCard.js

@@ -9,8 +9,8 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
 import { registerCard } from '../pm-plugins/actions';
+import { getAwarenessProps } from '../pm-plugins/utils';
 import OverlayWrapper from '../ui/ConfigureOverlay';
-import { getAwarenessProps } from '../utils';
 import { Card } from './genericCard';
 import { InlineCardWithAwareness } from './inlineCardWithAwareness';
 export var InlineCard = /*#__PURE__*/memo(function (_ref) {

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

@@ -10,10 +10,10 @@ import { getAnnotationMarksForPos, getLinkCreationAnalyticsEvent, isFromCurrentD
 import { closeHistory } from '@atlaskit/editor-prosemirror/history';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { appearanceForNodeType, isDatasourceConfigEditable, isDatasourceNode, selectedCardAppearance } from '../utils';
 import { hideDatasourceModal, queueCards, removeDatasourceStash, resolveCard, setDatasourceStash } from './actions';
 import { pluginKey } from './plugin-key';
 import { shouldReplaceLink } from './shouldReplaceLink';
+import { appearanceForNodeType, isDatasourceConfigEditable, isDatasourceNode, selectedCardAppearance } from './utils';
 
 /**
  * Attempt to replace the link into the respective card.

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

@@ -10,19 +10,19 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { eventsFromTransaction } from '../analytics/events-from-tr';
-import { isLocalStorageKeyDiscovered } from '../common/local-storage';
 import { InlineCardNodeView } from '../nodeviews/inlineCard';
 import { lazyBlockCardView } from '../nodeviews/lazy-block-card';
 import { lazyEmbedCardView } from '../nodeviews/lazy-embed-card';
 import { lazyInlineCardView } from '../nodeviews/lazy-inline-card';
+import { eventsFromTransaction } from '../ui/analytics/events-from-tr';
 import { isDatasourceTableLayout } from '../ui/LayoutButton/utils';
-import { isBlockSupportedAtPosition, isEmbedSupportedAtPosition } from '../utils';
+import { isLocalStorageKeyDiscovered } from '../ui/local-storage';
 import { clearOverlayCandidate, setCardLayoutAndDatasourceTableRef, setDatasourceTableRef } from './actions';
 import { pluginKey } from './plugin-key';
 import reducer from './reducers';
 import { handleProvider, resolveWithProvider } from './util/resolve';
 import { getNewRequests, getPluginState, getPluginStateWithUpdatedPos } from './util/state';
+import { isBlockSupportedAtPosition, isEmbedSupportedAtPosition } from './utils';
 export { pluginKey } from './plugin-key';
 var LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK = 'smart-link-upgrade-pulse';
 export var ALLOW_EVENTS_CLASSNAME = 'card-plugin-element-allow-events';

package/dist/esm/{utils.js → pm-plugins/utils.js}

@@ -3,7 +3,7 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { getResolvedAttributes } from '@atlaskit/link-analytics/resolved-attributes';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, CONFLUENCE_SEARCH_DATASOURCE_ID, JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
-import { pluginKey } from './pm-plugins/plugin-key';
+import { pluginKey } from './plugin-key';
 export var appearanceForNodeType = function appearanceForNodeType(spec) {
   if (spec.name === 'inlineCard') {
     return 'inline';

package/dist/esm/types/index.js

@@ -0,0 +1 @@
+export {};

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

@@ -8,10 +8,10 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
-import useLinkUpgradeDiscoverability from '../../common/hooks/useLinkUpgradeDiscoverability';
-import { isLocalStorageKeyDiscovered, LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK, LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR, markLocalStorageKeyDiscovered, ONE_DAY_IN_MILLISECONDS } from '../../common/local-storage';
-import { getResolvedAttributesFromStore } from '../../utils';
+import { getResolvedAttributesFromStore } from '../../pm-plugins/utils';
+import useLinkUpgradeDiscoverability from '../hooks/useLinkUpgradeDiscoverability';
 import InlineCardOverlay from '../InlineCardOverlay';
+import { isLocalStorageKeyDiscovered, LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK, LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR, markLocalStorageKeyDiscovered, ONE_DAY_IN_MILLISECONDS } from '../local-storage';
 import { DiscoveryPulse } from '../Pulse';
 // editor adds a standard line-height that is bigger than an inline smart link
 // due to that the link has a bit of white space around it, which doesn't look right when there is pulse around it

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 { DatasourceErrorBoundary } from '../../datasourceErrorBoundary';
-import { CardContextProvider } from '../CardContextProvider';
+import { EditorSmartCardProviderValueGuard, useSmartLinkContext } from '@atlaskit/link-provider';
+import { DatasourceErrorBoundary } from '../datasourceErrorBoundary';
 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/EditLinkToolbar.js

@@ -14,7 +14,7 @@ import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDT
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { hideLinkToolbar as _hideLinkToolbar, showLinkToolbar } from '../pm-plugins/actions';
 import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
-import { displayInfoForCard, findCardInfo } from '../utils';
+import { displayInfoForCard, findCardInfo } from '../pm-plugins/utils';
 export function HyperlinkAddToolbarWithState(_ref) {
   var _ref$linkPickerOption = _ref.linkPickerOptions,
     linkPickerOptions = _ref$linkPickerOption === void 0 ? {} : _ref$linkPickerOption,

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

@@ -14,7 +14,7 @@ import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlask
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
 import { Flex } from '@atlaskit/primitives';
-import { focusEditorView } from '../../utils';
+import { focusEditorView } from '../../pm-plugins/utils';
 import { editDatasource } from '../editDatasourceAction';
 var dropdownExpandContainer = css({
   margin: "0px ".concat("var(--ds-space-negative-050, -4px)")

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 { focusEditorView, isDatasourceConfigEditable } from '../../pm-plugins/utils';
 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/DatasourceEvents.js

@@ -8,7 +8,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { useEffect, useMemo } from 'react';
 import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { useDatasourceLifecycleAnalytics } from '@atlaskit/link-analytics';
-import { EVENT, EVENT_SUBJECT } from '../../analytics/types';
+import { EVENT, EVENT_SUBJECT } from '../analytics/types';
 import { getMethod } from './common';
 function getDatasourceDisplay(datasourceAttrs) {
   var _datasourceAttrs$data;

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

@@ -5,8 +5,8 @@ var _excluded = ["node", "nodeContext"],
   _excluded3 = ["node", "nodeContext"];
 import { useEffect, useMemo } from 'react';
 import { useSmartLinkLifecycleAnalytics } from '@atlaskit/link-analytics';
-import { EVENT, EVENT_SUBJECT } from '../../analytics/types';
-import { appearanceForLink, getUrl } from '../../analytics/utils';
+import { EVENT, EVENT_SUBJECT } from '../analytics/types';
+import { appearanceForLink, getUrl } from '../analytics/utils';
 import { getDeleteType, getMethod, getSourceEventFromMetadata, getUpdateType } from './common';
 
 /**

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/LayoutButton/index.js

@@ -19,7 +19,7 @@ import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
 import { B300, N20A, N300 } from '@atlaskit/theme/colors';
 import { setCardLayout } from '../../pm-plugins/actions';
-import { isDatasourceNode } from '../../utils';
+import { isDatasourceNode } from '../../pm-plugins/utils';
 import { getDatasource, isDatasourceTableLayout } from './utils';
 var toolbarButtonWrapperStyles = css({
   background: "".concat("var(--ds-background-neutral, ".concat(N20A, ")")),

package/dist/esm/ui/LayoutButton/utils.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 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 { findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { isDatasourceNode } from '../../utils';
+import { isDatasourceNode } from '../../pm-plugins/utils';
 import { DATASOURCE_TABLE_LAYOUTS } from './types';
 export var getDatasource = function getDatasource(editorView) {
   var _editorView$state = editorView.state,

package/dist/esm/ui/LinkToolbarAppearance.js

@@ -10,19 +10,20 @@ 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';
 import nodeNames, { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { isSupportedInParent } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR } from '../common/local-storage';
 import { changeSelectedCardToLink, setSelectedCardAppearance } from '../pm-plugins/doc';
-import { shouldRenderToolbarPulse } from '../toolbar';
-import { getResolvedAttributesFromStore } from '../utils';
+import { getResolvedAttributesFromStore } from '../pm-plugins/utils';
+import { LOCAL_STORAGE_DISCOVERY_KEY_TOOLBAR } from './local-storage';
 import { DiscoveryPulse } from './Pulse';
+import { shouldRenderToolbarPulse } from './toolbar';
+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/Pulse/index.js

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next/useAnalyticsEvents';
 import { Pulse } from '@atlaskit/linking-common';
-import { isLocalStorageKeyDiscovered, markLocalStorageKeyDiscovered } from '../../common/local-storage';
+import { isLocalStorageKeyDiscovered, markLocalStorageKeyDiscovered } from '../local-storage';
 export var DiscoveryPulse = function DiscoveryPulse(_ref) {
   var children = _ref.children,
     localStorageKey = _ref.localStorageKey,

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 { getResolvedAttributesFromStore } from '../utils';
-import { CardContextProvider } from './CardContextProvider';
+import { useSmartLinkContext } from '@atlaskit/link-provider';
+import { getResolvedAttributesFromStore } from '../pm-plugins/utils';
 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/esm/{analytics → ui/analytics}/events-from-tr.js

@@ -6,8 +6,8 @@ import { ACTION } from '@atlaskit/editor-common/analytics';
 import { getLinkMetadataFromTransaction } from '@atlaskit/editor-common/card';
 import { isLinkMark, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
-import { pluginKey } from '../pm-plugins/plugin-key';
-import { getPluginState } from '../pm-plugins/util/state';
+import { pluginKey } from '../../pm-plugins/plugin-key';
+import { getPluginState } from '../../pm-plugins/util/state';
 import { EVENT, EVENT_SUBJECT } from './types';
 import { appearanceForLink, areSameNodes, findAtPositions, findInNodeRange, getNodeContext, getNodeSubject } from './utils';
 

package/dist/esm/{analytics → ui/analytics}/utils.js

@@ -1,4 +1,4 @@
-import { appearanceForNodeType } from '../utils';
+import { appearanceForNodeType } from '../../pm-plugins/utils';
 import { EVENT_SUBJECT } from './types';
 export function isDatasourceNode(node) {
   return 'datasource' in node.attrs && !!node.attrs.datasource;

package/dist/esm/{datasourceErrorBoundary.js → ui/datasourceErrorBoundary.js}

@@ -11,7 +11,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import React from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { LazyLoadedDatasourceRenderFailedAnalyticsWrapper } from '@atlaskit/link-datasource';
-import { setSelectedCardAppearance } from './pm-plugins/doc';
+import { setSelectedCardAppearance } from '../pm-plugins/doc';
 export var DatasourceErrorBoundary = /*#__PURE__*/function (_React$Component) {
   _inherits(DatasourceErrorBoundary, _React$Component);
   var _super = _createSuper(DatasourceErrorBoundary);

package/dist/esm/{toolbar.js → ui/toolbar.js}

@@ -23,15 +23,15 @@ import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { changeSelectedCardToText } from './pm-plugins/doc';
-import { pluginKey } from './pm-plugins/main';
-import { DatasourceAppearanceButton } from './ui/DatasourceAppearanceButton';
-import { buildEditLinkToolbar, editLinkToolbarConfig, getEditLinkCallback } from './ui/EditLinkToolbar';
-import { EditToolbarButton } from './ui/EditToolbarButton';
-import { HyperlinkToolbarAppearance } from './ui/HyperlinkToolbarAppearance';
-import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
-import { ToolbarViewedEvent } from './ui/ToolbarViewedEvent';
-import { appearanceForNodeType, displayInfoForCard, findCardInfo, isDatasourceNode, titleUrlPairFromNode } from './utils';
+import { changeSelectedCardToText } from '../pm-plugins/doc';
+import { pluginKey } from '../pm-plugins/main';
+import { appearanceForNodeType, displayInfoForCard, findCardInfo, isDatasourceNode, titleUrlPairFromNode } from '../pm-plugins/utils';
+import { DatasourceAppearanceButton } from './DatasourceAppearanceButton';
+import { buildEditLinkToolbar, editLinkToolbarConfig, getEditLinkCallback } from './EditLinkToolbar';
+import { EditToolbarButton } from './EditToolbarButton';
+import { HyperlinkToolbarAppearance } from './HyperlinkToolbarAppearance';
+import { LinkToolbarAppearance } from './LinkToolbarAppearance';
+import { ToolbarViewedEvent } from './ToolbarViewedEvent';
 export var removeCard = function removeCard(editorAnalyticsApi) {
   return commandWithMetadata(function (state, dispatch) {
     if (!(state.selection instanceof NodeSelection)) {

package/dist/types/cardPlugin.d.ts

@@ -0,0 +1,2 @@
+import type { CardPlugin } from './cardPluginType';
+export declare const cardPlugin: CardPlugin;

package/dist/{types-ts4.5/plugin.d.ts → types/cardPluginType.d.ts}

@@ -35,5 +35,4 @@ export type CardPlugin = NextEditorPlugin<'card', {
     sharedState: CardPluginState | null;
     actions: CardPluginActions;
 }>;
-export declare const cardPlugin: CardPlugin;
 export {};

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
-export { cardPlugin } from './plugin';
-export type { CardPlugin } from './plugin';
+export { cardPlugin } from './cardPlugin';
+export type { CardPlugin } from './cardPluginType';
 export type { Request, CardPluginOptions, CardPluginState } from './types';