@atlaskit/editor-plugin-card 4.5.0 → 4.5.2

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

@@ -10,9 +10,8 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _linkProvider = require("@atlaskit/link-provider");
 var _EditorAnalyticsContext = require("../EditorAnalyticsContext");
 var _DatasourceEvents = require("./DatasourceEvents");
 var _LinkEvents = require("./LinkEvents");
@@ -28,30 +27,11 @@ var EditorLinkingPlatformAnalytics = exports.EditorLinkingPlatformAnalytics = /*
   }
   (0, _createClass2.default)(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.default.createElement(cardContext.Provider, {
-        value: cardContext.value
-      }, /*#__PURE__*/_react.default.createElement(_EditorAnalyticsContext.EditorAnalyticsContext, {
+    value: function render() {
+      return /*#__PURE__*/_react.default.createElement(_linkProvider.EditorSmartCardProvider, null, /*#__PURE__*/_react.default.createElement(_linkProvider.EditorSmartCardProviderValueGuard, null, /*#__PURE__*/_react.default.createElement(_EditorAnalyticsContext.EditorAnalyticsContext, {
         editorView: this.props.editorView
-      }, /*#__PURE__*/_react.default.createElement(_LinkEvents.LinkEventsBinding, this.props), /*#__PURE__*/_react.default.createElement(_DatasourceEvents.DatasourceEventsBinding, this.props)));
+      }, /*#__PURE__*/_react.default.createElement(_LinkEvents.LinkEventsBinding, this.props), /*#__PURE__*/_react.default.createElement(_DatasourceEvents.DatasourceEventsBinding, this.props))));
     }
   }]);
   return EditorLinkingPlatformAnalytics;
-}(_react.default.PureComponent);
-(0, _defineProperty2.default)(EditorLinkingPlatformAnalytics, "contextTypes", {
-  contextAdapter: _propTypes.default.object
-});
+}(_react.default.PureComponent);

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

@@ -18,7 +18,7 @@ var _expand = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/expand
 var _linkingCommon = require("@atlaskit/linking-common");
 var _colors = require("@atlaskit/theme/colors");
 var _actions = require("../../pm-plugins/actions");
-var _utils2 = require("../../utils");
+var _utils2 = require("../../pm-plugins/utils");
 var _utils3 = require("./utils");
 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) { (0, _defineProperty2.default)(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; } /**

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.isDatasourceTableLayout = exports.getDatasource = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _utils2 = require("../../utils");
+var _utils2 = require("../../pm-plugins/utils");
 var _types = require("./types");
 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) { (0, _defineProperty2.default)(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; }

package/dist/cjs/ui/LinkToolbarAppearance.js

@@ -14,18 +14,18 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
-var _localStorage = require("../common/local-storage");
 var _doc = require("../pm-plugins/doc");
-var _toolbar = require("../toolbar");
-var _utils2 = require("../utils");
+var _utils2 = require("../pm-plugins/utils");
+var _localStorage = require("./local-storage");
 var _Pulse = require("./Pulse");
+var _toolbar = require("./toolbar");
+var _WithCardContext = require("./WithCardContext");
 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; }
 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; }
@@ -146,16 +146,15 @@ var LinkToolbarAppearance = exports.LinkToolbarAppearance = /*#__PURE__*/functio
   (0, _createClass2.default)(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.default.createElement(_WithCardContext.WithCardContext, null, function (cardContext) {
+        return _this2.renderDropdown(editorView, cardContext && cardContext.value);
+      });
     }
   }]);
   return LinkToolbarAppearance;
 }(_react.default.Component);
-(0, _defineProperty2.default)(LinkToolbarAppearance, "contextTypes", {
-  contextAdapter: _propTypes.default.object
-});
 var getUnavailableMessage = function getUnavailableMessage(state, intl) {
   try {
     var parentNode = state.selection.$from.node(1);

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

@@ -8,7 +8,7 @@ exports.DiscoveryPulse = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _useAnalyticsEvents2 = require("@atlaskit/analytics-next/useAnalyticsEvents");
 var _linkingCommon = require("@atlaskit/linking-common");
-var _localStorage = require("../../common/local-storage");
+var _localStorage = require("../local-storage");
 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; }
 var DiscoveryPulse = exports.DiscoveryPulse = function DiscoveryPulse(_ref) {

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 _utils = require("../utils");
-var _CardContextProvider = require("./CardContextProvider");
+var _linkProvider = require("@atlaskit/link-provider");
+var _utils = require("../pm-plugins/utils");
 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/cjs/{analytics → ui/analytics}/events-from-tr.js

@@ -14,8 +14,8 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
 var _utils = require("@atlaskit/editor-common/utils");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _pluginKey = require("../pm-plugins/plugin-key");
-var _state = require("../pm-plugins/util/state");
+var _pluginKey = require("../../pm-plugins/plugin-key");
+var _state = require("../../pm-plugins/util/state");
 var _types = require("./types");
 var _utils2 = require("./utils");
 /**

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

@@ -9,7 +9,7 @@ exports.getNodeSubject = getNodeSubject;
 exports.getUrl = getUrl;
 exports.isDatasourceNode = isDatasourceNode;
 exports.isLinkNode = void 0;
-var _utils = require("../utils");
+var _utils = require("../../pm-plugins/utils");
 var _types = require("./types");
 function isDatasourceNode(node) {
   return 'datasource' in node.attrs && !!node.attrs.datasource;

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

@@ -15,7 +15,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _linkDatasource = require("@atlaskit/link-datasource");
-var _doc = require("./pm-plugins/doc");
+var _doc = require("../pm-plugins/doc");
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /* eslint-disable @repo/internal/react/no-class-components */
 var DatasourceErrorBoundary = exports.DatasourceErrorBoundary = /*#__PURE__*/function (_React$Component) {

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

@@ -29,15 +29,15 @@ var _settings2 = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/set
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
 var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _doc = require("./pm-plugins/doc");
-var _main = require("./pm-plugins/main");
-var _DatasourceAppearanceButton = require("./ui/DatasourceAppearanceButton");
-var _EditLinkToolbar = require("./ui/EditLinkToolbar");
-var _EditToolbarButton = require("./ui/EditToolbarButton");
-var _HyperlinkToolbarAppearance = require("./ui/HyperlinkToolbarAppearance");
-var _LinkToolbarAppearance = require("./ui/LinkToolbarAppearance");
-var _ToolbarViewedEvent = require("./ui/ToolbarViewedEvent");
-var _utils3 = require("./utils");
+var _doc = require("../pm-plugins/doc");
+var _main = require("../pm-plugins/main");
+var _utils3 = require("../pm-plugins/utils");
+var _DatasourceAppearanceButton = require("./DatasourceAppearanceButton");
+var _EditLinkToolbar = require("./EditLinkToolbar");
+var _EditToolbarButton = require("./EditToolbarButton");
+var _HyperlinkToolbarAppearance = require("./HyperlinkToolbarAppearance");
+var _LinkToolbarAppearance = require("./LinkToolbarAppearance");
+var _ToolbarViewedEvent = require("./ToolbarViewedEvent");
 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; }
 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; }

package/dist/es2019/{plugin.js → cardPlugin.js}

@@ -3,26 +3,21 @@ import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconDatasourceAssetsObjects, IconDatasourceConfluenceSearch, IconDatasourceJiraIssue } from '@atlaskit/editor-common/quick-insert';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID, CONFLUENCE_SEARCH_DATASOURCE_ID } from '@atlaskit/link-datasource';
-import { createEventsQueue } from './analytics/create-events-queue';
+import { blockCardSpecWithFixedToDOM } from './nodeviews/toDOM-fixes/blockCard';
+import { embedCardSpecWithFixedToDOM } from './nodeviews/toDOM-fixes/embedCard';
+import { inlineCardSpecWithFixedToDOM } from './nodeviews/toDOM-fixes/inlineCard';
 import { hideLinkToolbar, setProvider, showDatasourceModal } from './pm-plugins/actions';
 import { queueCardsFromChangedTr } from './pm-plugins/doc';
 import { cardKeymap } from './pm-plugins/keymap';
 import { createPlugin } from './pm-plugins/main';
 import { pluginKey } from './pm-plugins/plugin-key';
-import { blockCardSpecWithFixedToDOM } from './toDOM-fixes/blockCard';
-import { embedCardSpecWithFixedToDOM } from './toDOM-fixes/embedCard';
-import { inlineCardSpecWithFixedToDOM } from './toDOM-fixes/inlineCard';
-import { floatingToolbar, getEndingToolbarItems, getStartingToolbarItems } from './toolbar';
+import { isDatasourceConfigEditable } from './pm-plugins/utils';
+import { createEventsQueue } from './ui/analytics/create-events-queue';
 import DatasourceModalWithState from './ui/DatasourceModal/ModalWithState';
 import { EditorLinkingPlatformAnalytics } from './ui/EditorLinkingPlatformAnalytics';
 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
-
+import { floatingToolbar, getEndingToolbarItems, getStartingToolbarItems } from './ui/toolbar';
 export const cardPlugin = ({
   config: options = {},
   api

package/dist/es2019/index.js

@@ -1 +1 @@
-export { cardPlugin } from './plugin';
+export { cardPlugin } from './cardPlugin';

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';
@@ -9,7 +8,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
 import { Datasource } from '../nodeviews/datasource';
 import { registerCard } from '../pm-plugins/actions';
-import { isDatasourceNode } from '../utils';
+import { isDatasourceNode } from '../pm-plugins/utils';
 import { Card } from './genericCard';
 
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -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,15 +7,15 @@ 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';
+import { DatasourceErrorBoundary } from '../ui/datasourceErrorBoundary';
 import { EditorAnalyticsContext } from '../ui/EditorAnalyticsContext';
 const getPosSafely = pos => {
   if (!pos || typeof pos === 'boolean') {
@@ -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,7 +8,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';
 const WithClickHandler = ({
   pluginInjectionApi,
   url,
@@ -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/nodeviews/inlineCard.js

@@ -8,8 +8,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 const InlineCard = /*#__PURE__*/memo(({

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

@@ -6,10 +6,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/es2019/pm-plugins/main.js

@@ -6,19 +6,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';
 const LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK = 'smart-link-upgrade-pulse';
 export const ALLOW_EVENTS_CLASSNAME = 'card-plugin-element-allow-events';

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

@@ -2,7 +2,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 const appearanceForNodeType = spec => {
   if (spec.name === 'inlineCard') {
     return 'inline';

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

@@ -7,10 +7,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/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
-  }));
+  });
 };